Mercurial > emacs
annotate lisp/simple.el @ 45081:83757531e45f
*** empty log message ***
author | Colin Walters <walters@gnu.org> |
---|---|
date | Thu, 02 May 2002 23:51:57 +0000 |
parents | 829beb9a6a4b |
children | 453e599fd7f8 |
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 |
43969 | 3 ;; Copyright (C) 1985, 86, 87, 93, 94, 95, 96, 97, 98, 99, 2000, 2001, 2002 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
475 | 5 |
45078 | 6 ;; Maintainer: FSF |
7 ;; Keywords: internal | |
8 | |
475 | 9 ;; This file is part of GNU Emacs. |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; 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
|
13 ;; the Free Software Foundation; either version 2, or (at your option) |
475 | 14 ;; any later version. |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
14169 | 22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
24 ;; Boston, MA 02111-1307, USA. | |
475 | 25 |
2315
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
26 ;;; Commentary: |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
27 |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
28 ;; 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
|
29 ;; major mode or to file-handling. |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
30 |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
31 ;;; Code: |
475 | 32 |
26466 | 33 (eval-when-compile |
30820
4b32734572d8
Autoload widget-convert when compiling.
Dave Love <fx@gnu.org>
parents:
30441
diff
changeset
|
34 (autoload 'widget-convert "wid-edit") |
31573 | 35 (autoload 'shell-mode "shell") |
26466 | 36 (require 'cl)) |
37 | |
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 | 69 (defun fundamental-mode () |
70 "Major mode not specialized for anything in particular. | |
71 Other major modes are defined by comparison with this one." | |
72 (interactive) | |
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 | 75 ;; Making and deleting lines. |
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 | 79 If `use-hard-newlines' is non-nil, the newline is marked with the |
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 | 82 Call `auto-fill-function' if the current column number is greater |
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 | 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 | 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 | 183 |
184 (defun split-line () | |
185 "Split current line, moving portion beyond point vertically down." | |
186 (interactive "*") | |
187 (skip-chars-forward " \t") | |
188 (let ((col (current-column)) | |
189 (pos (point))) | |
10422
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
190 (newline 1) |
475 | 191 (indent-to col 0) |
192 (goto-char pos))) | |
193 | |
194 (defun delete-indentation (&optional arg) | |
195 "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
|
196 If there is a fill prefix, delete it from the beginning of this line. |
475 | 197 With argument, join this line to following line." |
198 (interactive "*P") | |
199 (beginning-of-line) | |
200 (if arg (forward-line 1)) | |
201 (if (eq (preceding-char) ?\n) | |
202 (progn | |
203 (delete-region (point) (1- (point))) | |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
204 ;; If the second line started with the fill prefix, |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
205 ;; delete the prefix. |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
206 (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
|
207 (<= (+ (point) (length fill-prefix)) (point-max)) |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
208 (string= fill-prefix |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
209 (buffer-substring (point) |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
210 (+ (point) (length fill-prefix))))) |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
211 (delete-region (point) (+ (point) (length fill-prefix)))) |
475 | 212 (fixup-whitespace)))) |
213 | |
24078 | 214 (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
|
215 |
475 | 216 (defun delete-blank-lines () |
217 "On blank line, delete all surrounding blank lines, leaving just one. | |
218 On isolated blank line, delete that one. | |
7817
d729f75fff04
(delete-blank-lines): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7762
diff
changeset
|
219 On nonblank line, delete any immediately following blank lines." |
475 | 220 (interactive "*") |
221 (let (thisblank singleblank) | |
222 (save-excursion | |
223 (beginning-of-line) | |
224 (setq thisblank (looking-at "[ \t]*$")) | |
715 | 225 ;; Set singleblank if there is just one blank line here. |
475 | 226 (setq singleblank |
227 (and thisblank | |
228 (not (looking-at "[ \t]*\n[ \t]*$")) | |
229 (or (bobp) | |
230 (progn (forward-line -1) | |
231 (not (looking-at "[ \t]*$"))))))) | |
715 | 232 ;; Delete preceding blank lines, and this one too if it's the only one. |
475 | 233 (if thisblank |
234 (progn | |
235 (beginning-of-line) | |
236 (if singleblank (forward-line 1)) | |
237 (delete-region (point) | |
238 (if (re-search-backward "[^ \t\n]" nil t) | |
239 (progn (forward-line 1) (point)) | |
240 (point-min))))) | |
715 | 241 ;; Delete following blank lines, unless the current line is blank |
242 ;; and there are no following blank lines. | |
475 | 243 (if (not (and thisblank singleblank)) |
244 (save-excursion | |
245 (end-of-line) | |
246 (forward-line 1) | |
247 (delete-region (point) | |
248 (if (re-search-forward "[^ \t\n]" nil t) | |
249 (progn (beginning-of-line) (point)) | |
715 | 250 (point-max))))) |
251 ;; Handle the special case where point is followed by newline and eob. | |
252 ;; Delete the line, leaving point at eob. | |
253 (if (looking-at "^[ \t]*\n\\'") | |
254 (delete-region (point) (point-max))))) | |
475 | 255 |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
256 (defun delete-trailing-whitespace () |
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
257 "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
|
258 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
|
259 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
|
260 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
|
261 (interactive "*") |
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
262 (save-match-data |
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
263 (save-excursion |
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
264 (goto-char (point-min)) |
34141
799f637fbc35
(delete-trailing-whitespace): Don't delete newlines too.
Miles Bader <miles@gnu.org>
parents:
34101
diff
changeset
|
265 (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
|
266 (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
|
267 ;; 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
|
268 (save-match-data |
08dafe901c44
(delete-trailing-whitespace): Save match data
Gerd Moellmann <gerd@gnu.org>
parents:
38432
diff
changeset
|
269 (if (looking-at ".*\f") |
08dafe901c44
(delete-trailing-whitespace): Save match data
Gerd Moellmann <gerd@gnu.org>
parents:
38432
diff
changeset
|
270 (goto-char (match-end 0)))) |
34619
237139766bdc
(delete-trailing-whitespace): Remove extraneous let.
Miles Bader <miles@gnu.org>
parents:
34570
diff
changeset
|
271 (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
|
272 |
475 | 273 (defun newline-and-indent () |
274 "Insert a newline, then indent according to major mode. | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
275 Indentation is done using the value of `indent-line-function'. |
475 | 276 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
|
277 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
|
278 column specified by the function `current-left-margin'." |
475 | 279 (interactive "*") |
34462
6a7373de926f
(delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents:
34443
diff
changeset
|
280 (delete-horizontal-space t) |
617 | 281 (newline) |
475 | 282 (indent-according-to-mode)) |
283 | |
284 (defun reindent-then-newline-and-indent () | |
285 "Reindent current line, insert newline, then indent the new line. | |
286 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
|
287 which means calling the current value of `indent-line-function'. |
475 | 288 In programming language modes, this is the same as TAB. |
289 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
|
290 column specified by the function `current-left-margin'." |
475 | 291 (interactive "*") |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
292 (delete-horizontal-space t) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
293 (let ((pos (point))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
294 ;; 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
|
295 ;; 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
|
296 (newline) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
297 (save-excursion |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
298 (goto-char pos) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
299 (indent-according-to-mode)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
300 (indent-according-to-mode))) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
301 |
25292 | 302 (defun quoted-insert (arg) |
303 "Read next input character and insert it. | |
304 This is useful for inserting control characters. | |
305 | |
306 If the first character you type after this command is an octal digit, | |
307 you should type a sequence of octal digits which specify a character code. | |
308 Any nondigit terminates the sequence. If the terminator is a RET, | |
309 it is discarded; any other terminator is used itself as input. | |
310 The variable `read-quoted-char-radix' specifies the radix for this feature; | |
311 set it to 10 or 16 to use decimal or hex instead of octal. | |
312 | |
313 In overwrite mode, this function inserts the character anyway, and | |
314 does not handle octal digits specially. This means that if you use | |
315 overwrite as your normal editing mode, you can use this function to | |
316 insert characters when necessary. | |
317 | |
318 In binary overwrite mode, this function does overwrite, and octal | |
319 digits are interpreted as a character code. This is intended to be | |
320 useful for editing binary files." | |
321 (interactive "*p") | |
322 (let ((char (if (or (not overwrite-mode) | |
323 (eq overwrite-mode 'overwrite-mode-binary)) | |
324 (read-quoted-char) | |
325 (read-char)))) | |
326 ;; Assume character codes 0240 - 0377 stand for characters in some | |
327 ;; single-byte character set, and convert them to Emacs | |
328 ;; characters. | |
329 (if (and enable-multibyte-characters | |
330 (>= char ?\240) | |
331 (<= char ?\377)) | |
332 (setq char (unibyte-char-to-multibyte char))) | |
333 (if (> arg 0) | |
334 (if (eq overwrite-mode 'overwrite-mode-binary) | |
335 (delete-char arg))) | |
336 (while (> arg 0) | |
337 (insert-and-inherit char) | |
338 (setq arg (1- arg))))) | |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
339 |
25292 | 340 (defun forward-to-indentation (arg) |
341 "Move forward ARG lines and position at first nonblank character." | |
342 (interactive "p") | |
343 (forward-line arg) | |
344 (skip-chars-forward " \t")) | |
345 | |
346 (defun backward-to-indentation (arg) | |
347 "Move backward ARG lines and position at first nonblank character." | |
348 (interactive "p") | |
349 (forward-line (- arg)) | |
350 (skip-chars-forward " \t")) | |
351 | |
352 (defun back-to-indentation () | |
353 "Move point to the first non-whitespace character on this line." | |
354 (interactive) | |
355 (beginning-of-line 1) | |
356 (skip-chars-forward " \t")) | |
357 | |
358 (defun fixup-whitespace () | |
359 "Fixup white space between objects around point. | |
360 Leave one space or none, according to the context." | |
361 (interactive "*") | |
362 (save-excursion | |
363 (delete-horizontal-space) | |
364 (if (or (looking-at "^\\|\\s)") | |
365 (save-excursion (forward-char -1) | |
366 (looking-at "$\\|\\s(\\|\\s'"))) | |
367 nil | |
368 (insert ?\ )))) | |
369 | |
34462
6a7373de926f
(delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents:
34443
diff
changeset
|
370 (defun delete-horizontal-space (&optional backward-only) |
6a7373de926f
(delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents:
34443
diff
changeset
|
371 "Delete all spaces and tabs around point. |
6a7373de926f
(delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents:
34443
diff
changeset
|
372 If BACKWARD-ONLY is non-nil, only delete spaces before point." |
25292 | 373 (interactive "*") |
37791
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
374 (let ((orig-pos (point))) |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
375 (delete-region |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
376 (if backward-only |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
377 orig-pos |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
378 (progn |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
379 (skip-chars-forward " \t") |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
380 (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
|
381 (progn |
37791
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
382 (skip-chars-backward " \t") |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
383 (constrain-to-field nil orig-pos))))) |
25292 | 384 |
385 (defun just-one-space () | |
386 "Delete all spaces and tabs around point, leaving one space." | |
387 (interactive "*") | |
37791
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
388 (let ((orig-pos (point))) |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
389 (skip-chars-backward " \t") |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
390 (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
|
391 (if (= (following-char) ? ) |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
392 (forward-char 1) |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
393 (insert ? )) |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
394 (delete-region |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
395 (point) |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
396 (progn |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
397 (skip-chars-forward " \t") |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
398 (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
|
399 |
475 | 400 (defun beginning-of-buffer (&optional arg) |
401 "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
|
402 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
|
403 |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
404 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
|
405 of the accessible part of the buffer. |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
406 |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
407 Don't use this command in Lisp programs! |
475 | 408 \(goto-char (point-min)) is faster and avoids clobbering the mark." |
409 (interactive "P") | |
410 (push-mark) | |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
411 (let ((size (- (point-max) (point-min)))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
412 (goto-char (if arg |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
413 (+ (point-min) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
414 (if (> size 10000) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
415 ;; Avoid overflow for large buffer sizes! |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
416 (* (prefix-numeric-value arg) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
417 (/ size 10)) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
418 (/ (+ 10 (* size (prefix-numeric-value arg))) 10))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
419 (point-min)))) |
475 | 420 (if arg (forward-line 1))) |
421 | |
422 (defun end-of-buffer (&optional arg) | |
423 "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
|
424 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
|
425 |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
426 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
|
427 of the accessible part of the buffer. |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
428 |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
429 Don't use this command in Lisp programs! |
475 | 430 \(goto-char (point-max)) is faster and avoids clobbering the mark." |
431 (interactive "P") | |
432 (push-mark) | |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
433 (let ((size (- (point-max) (point-min)))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
434 (goto-char (if arg |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
435 (- (point-max) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
436 (if (> size 10000) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
437 ;; Avoid overflow for large buffer sizes! |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
438 (* (prefix-numeric-value arg) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
439 (/ size 10)) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
440 (/ (* size (prefix-numeric-value arg)) 10))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
441 (point-max)))) |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
442 ;; 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
|
443 ;; 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
|
444 (cond (arg (forward-line 1)) |
39743
b6933b0f1ef2
(end-of-buffer): Fix code scrolling specially
Gerd Moellmann <gerd@gnu.org>
parents:
39612
diff
changeset
|
445 ((> (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
|
446 ;; 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
|
447 ;; 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
|
448 (overlay-recenter (point)) |
bcd25953e4cf
(end-of-buffer): Use window-end to find the window end
Gerd Moellmann <gerd@gnu.org>
parents:
26201
diff
changeset
|
449 (recenter -3)))) |
475 | 450 |
451 (defun mark-whole-buffer () | |
715 | 452 "Put point at beginning and mark at end of buffer. |
453 You probably should not use this function in Lisp programs; | |
454 it is usually a mistake for a Lisp function to use any subroutine | |
455 that uses or sets the mark." | |
475 | 456 (interactive) |
457 (push-mark (point)) | |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
458 (push-mark (point-max) nil t) |
475 | 459 (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
|
460 |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
461 |
25292 | 462 ;; Counting lines, one way or another. |
463 | |
464 (defun goto-line (arg) | |
465 "Goto line ARG, counting from line 1 at beginning of buffer." | |
466 (interactive "NGoto line: ") | |
467 (setq arg (prefix-numeric-value arg)) | |
468 (save-restriction | |
469 (widen) | |
470 (goto-char 1) | |
471 (if (eq selective-display t) | |
472 (re-search-forward "[\n\C-m]" nil 'end (1- arg)) | |
473 (forward-line (1- arg))))) | |
475 | 474 |
475 (defun count-lines-region (start end) | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3487
diff
changeset
|
476 "Print number of lines and characters in the region." |
475 | 477 (interactive "r") |
478 (message "Region has %d lines, %d characters" | |
479 (count-lines start end) (- end start))) | |
480 | |
481 (defun what-line () | |
12939
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
482 "Print the current buffer line number and narrowed line number of point." |
475 | 483 (interactive) |
12939
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
484 (let ((opoint (point)) start) |
475 | 485 (save-excursion |
12939
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
486 (save-restriction |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
487 (goto-char (point-min)) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
488 (widen) |
40018
3f454d4a2b7c
(what-line): Avoid problems with field properties.
Miles Bader <miles@gnu.org>
parents:
39942
diff
changeset
|
489 (forward-line 0) |
12939
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
490 (setq start (point)) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
491 (goto-char opoint) |
40018
3f454d4a2b7c
(what-line): Avoid problems with field properties.
Miles Bader <miles@gnu.org>
parents:
39942
diff
changeset
|
492 (forward-line 0) |
12939
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
493 (if (/= start 1) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
494 (message "line %d (narrowed line %d)" |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
495 (1+ (count-lines 1 (point))) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
496 (1+ (count-lines start (point)))) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
497 (message "Line %d" (1+ (count-lines 1 (point))))))))) |
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
498 |
475 | 499 (defun count-lines (start end) |
500 "Return number of lines between START and END. | |
501 This is usually the number of newlines between them, | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
502 but can be one more if START is not equal to END |
475 | 503 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
|
504 (save-excursion |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
505 (save-restriction |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
506 (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
|
507 (goto-char (point-min)) |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
508 (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
|
509 (save-match-data |
2421
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
510 (let ((done 0)) |
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
511 (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
|
512 (setq done (+ 40 done))) |
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
513 (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
|
514 (setq done (+ 1 done))) |
5151
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
515 (goto-char (point-max)) |
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
516 (if (and (/= start end) |
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
517 (not (bolp))) |
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
518 (1+ done) |
9554
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
519 done))) |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
520 (- (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
|
521 |
16999
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
522 (defun what-cursor-position (&optional detail) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
523 "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
|
524 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
|
525 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
|
526 |
0f92ac490b66
* simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents:
24372
diff
changeset
|
527 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
|
528 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
|
529 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
|
530 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
|
531 byte, just \"...\" is shown. |
23963
c242e2dc93a9
(what-cursor-position): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
23944
diff
changeset
|
532 |
28896
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
533 In addition, with prefix argument, show details about that character |
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
534 in *Help* buffer. See also the command `describe-char-after'." |
16999
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
535 (interactive "P") |
475 | 536 (let* ((char (following-char)) |
537 (beg (point-min)) | |
538 (end (point-max)) | |
539 (pos (point)) | |
540 (total (buffer-size)) | |
541 (percent (if (> total 50000) | |
542 ;; Avoid overflow from multiplying by 100! | |
543 (/ (+ (/ total 200) (1- pos)) (max (/ total 100) 1)) | |
544 (/ (+ (/ total 2) (* 100 (1- pos))) (max total 1)))) | |
545 (hscroll (if (= (window-hscroll) 0) | |
546 "" | |
547 (format " Hscroll=%d" (window-hscroll)))) | |
548 (col (current-column))) | |
549 (if (= pos end) | |
550 (if (or (/= beg 1) (/= end (1+ total))) | |
27477
8a7e3bcab064
(what-cursor-position): Change formatting of
Gerd Moellmann <gerd@gnu.org>
parents:
27302
diff
changeset
|
551 (message "point=%d of %d (%d%%) <%d - %d> column %d %s" |
475 | 552 pos total percent beg end col hscroll) |
27477
8a7e3bcab064
(what-cursor-position): Change formatting of
Gerd Moellmann <gerd@gnu.org>
parents:
27302
diff
changeset
|
553 (message "point=%d of %d (%d%%) column %d %s" |
475 | 554 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
|
555 (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
|
556 encoded encoding-msg) |
0f92ac490b66
* simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents:
24372
diff
changeset
|
557 (if (or (not coding) |
0f92ac490b66
* simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents:
24372
diff
changeset
|
558 (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
|
559 (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
|
560 (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
|
561 (setq encoding-msg |
f9e613360d62
(what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents:
24419
diff
changeset
|
562 (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
|
563 (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
|
564 (setq encoding-msg |
f9e613360d62
(what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents:
24419
diff
changeset
|
565 (if encoded |
28896
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
566 (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
|
567 char char char |
28896
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
568 (if (> (length encoded) 1) |
24508
f9e613360d62
(what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents:
24419
diff
changeset
|
569 "..." |
28896
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
570 (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
|
571 (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
|
572 (if detail |
28896
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
573 ;; We show the detailed information about CHAR. |
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
574 (describe-char-after (point))) |
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
575 (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
|
576 (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
|
577 (if (< char 256) |
8063bfbd8b08
(what-cursor-position): Show "(composed)" if the
Kenichi Handa <handa@m17n.org>
parents:
26744
diff
changeset
|
578 (single-key-description char) |
8063bfbd8b08
(what-cursor-position): Show "(composed)" if the
Kenichi Handa <handa@m17n.org>
parents:
26744
diff
changeset
|
579 (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
|
580 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
|
581 (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
|
582 (if (< char 256) |
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
583 (single-key-description char) |
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
584 (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
|
585 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
|
586 |
31978
3a5e22f4cd99
(read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31573
diff
changeset
|
587 (defvar read-expression-map |
3a5e22f4cd99
(read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31573
diff
changeset
|
588 (let ((m (make-sparse-keymap))) |
3a5e22f4cd99
(read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31573
diff
changeset
|
589 (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
|
590 (set-keymap-parent m minibuffer-local-map) |
3a5e22f4cd99
(read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31573
diff
changeset
|
591 m) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
592 "Minibuffer keymap used for reading Lisp expressions.") |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
593 |
4289
4d0c57f01eed
(read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents:
4287
diff
changeset
|
594 (defvar read-expression-history nil) |
4d0c57f01eed
(read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents:
4287
diff
changeset
|
595 |
25702
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
596 (defcustom eval-expression-print-level 4 |
42128 | 597 "*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
|
598 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
|
599 :group 'lisp |
42128 | 600 :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
|
601 :version "21.1") |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
602 |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
603 (defcustom eval-expression-print-length 12 |
42128 | 604 "*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
|
605 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
|
606 :group 'lisp |
42128 | 607 :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
|
608 :version "21.1") |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
609 |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
610 (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
|
611 "*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
|
612 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
|
613 :group 'lisp |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
614 :type 'boolean |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
615 :version "21.1") |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
616 |
4289
4d0c57f01eed
(read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents:
4287
diff
changeset
|
617 ;; We define this, rather than making `eval' interactive, |
475 | 618 ;; 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
|
619 (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
|
620 &optional eval-expression-insert-value) |
36021 | 621 "Evaluate EVAL-EXPRESSION-ARG and print value in the echo area. |
622 Value is also consed on to front of the variable `values'. | |
623 Optional argument EVAL-EXPRESSION-INSERT-VALUE, if non-nil, means | |
624 insert the result into the current buffer instead of printing it in | |
625 the echo area." | |
4886
20e345c97e28
(eval-expression, edit-and-eval-command): Let
Brian Fox <bfox@gnu.org>
parents:
4869
diff
changeset
|
626 (interactive |
5068
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
627 (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
|
628 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
|
629 'read-expression-history) |
9f6b375ce842
(eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19362
diff
changeset
|
630 current-prefix-arg)) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
631 |
27302
1cb6c18c3163
(eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents:
27298
diff
changeset
|
632 (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
|
633 (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
|
634 (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
|
635 ;; 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
|
636 ;; 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
|
637 (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
|
638 (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
|
639 (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
|
640 ;; 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
|
641 ;; 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
|
642 (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
|
643 (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
|
644 |
25702
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
645 (let ((print-length eval-expression-print-length) |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
646 (print-level eval-expression-print-level)) |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
647 (prin1 (car values) |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
648 (if eval-expression-insert-value (current-buffer) t)))) |
475 | 649 |
650 (defun edit-and-eval-command (prompt command) | |
651 "Prompting with PROMPT, let user edit COMMAND and eval result. | |
652 COMMAND is a Lisp expression. Let user edit that expression in | |
653 the minibuffer, then read and evaluate the result." | |
5068
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
654 (let ((command (read-from-minibuffer prompt |
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
655 (prin1-to-string command) |
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
656 read-expression-map t |
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
657 '(command-history . 1)))) |
9629
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
658 ;; If command was added to command-history as a string, |
13960
5f1ba0200a33
(shell-command): Fix message spelling.
Karl Heuer <kwzh@gnu.org>
parents:
13810
diff
changeset
|
659 ;; get rid of that. We want only evaluable expressions there. |
9629
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
660 (if (stringp (car command-history)) |
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
661 (setq command-history (cdr command-history))) |
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
662 |
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
663 ;; 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
|
664 ;; 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
|
665 (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
|
666 (setq command-history (cons command command-history))) |
475 | 667 (eval command))) |
668 | |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
669 (defun repeat-complex-command (arg) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
670 "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
|
671 A complex command is one which used the minibuffer. |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
672 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
|
673 The result is executed, repeating the command as changed. |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
674 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
|
675 it is added to the front of the command history. |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
676 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
|
677 to get different commands to edit and resubmit." |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
678 (interactive "p") |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
679 (let ((elt (nth (1- arg) command-history)) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
680 newcmd) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
681 (if elt |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
682 (progn |
4821
2c16f99ef5dc
(edit-and-eval-command): Let `read-from-minibuffer' manipulate the
Brian Fox <bfox@gnu.org>
parents:
4765
diff
changeset
|
683 (setq newcmd |
16803
3d4a27ecfba9
(repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents:
16723
diff
changeset
|
684 (let ((print-level nil) |
3d4a27ecfba9
(repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents:
16723
diff
changeset
|
685 (minibuffer-history-position arg) |
20022
c9ed682ff86f
(previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents:
19888
diff
changeset
|
686 (minibuffer-history-sexp-flag (1+ (minibuffer-depth)))) |
8734
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
687 (read-from-minibuffer |
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
688 "Redo: " (prin1-to-string elt) read-expression-map t |
bd55f44d82f1
(repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents:
8695
diff
changeset
|
689 (cons 'command-history arg)))) |
4821
2c16f99ef5dc
(edit-and-eval-command): Let `read-from-minibuffer' manipulate the
Brian Fox <bfox@gnu.org>
parents:
4765
diff
changeset
|
690 |
5135
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
691 ;; If command was added to command-history as a string, |
13960
5f1ba0200a33
(shell-command): Fix message spelling.
Karl Heuer <kwzh@gnu.org>
parents:
13810
diff
changeset
|
692 ;; get rid of that. We want only evaluable expressions there. |
5135
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
693 (if (stringp (car command-history)) |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
694 (setq command-history (cdr command-history))) |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
695 |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
696 ;; 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
|
697 ;; add it to the history. |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
698 (or (equal newcmd (car command-history)) |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
699 (setq command-history (cons newcmd command-history))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
700 (eval newcmd)) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
701 (ding)))) |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
702 |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
703 (defvar minibuffer-history nil |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
704 "Default minibuffer history list. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
705 This is used for all minibuffer input |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
706 except when an alternate history list is specified.") |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
707 (defvar minibuffer-history-sexp-flag nil |
41215
e4e7371d61e9
(minibuffer-history-sexp-flag): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
40966
diff
changeset
|
708 "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
|
709 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
|
710 contains expressions rather than strings. |
c9ed682ff86f
(previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents:
19888
diff
changeset
|
711 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
|
712 to handle recursive uses of the minibuffer.") |
862
46630543d659
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
859
diff
changeset
|
713 (setq minibuffer-history-variable 'minibuffer-history) |
46630543d659
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
859
diff
changeset
|
714 (setq minibuffer-history-position nil) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
715 (defvar minibuffer-history-search-history nil) |
858
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
716 |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
717 (defvar minibuffer-text-before-history nil |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
718 "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
|
719 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
|
720 in this use of the minibuffer.") |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
721 |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
722 (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
|
723 |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
724 (defun minibuffer-history-initialize () |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
725 (setq minibuffer-text-before-history nil)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
726 |
33683
8fc77111dd98
(minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents:
33352
diff
changeset
|
727 (defun minibuffer-avoid-prompt (new old) |
8fc77111dd98
(minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents:
33352
diff
changeset
|
728 "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
|
729 (constrain-to-field nil (point-max))) |
8fc77111dd98
(minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents:
33352
diff
changeset
|
730 |
22257
23e2e03f2bf6
(minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22157
diff
changeset
|
731 (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
|
732 "*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
|
733 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
|
734 \\[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
|
735 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
|
736 :type '(repeat variable) |
23e2e03f2bf6
(minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22157
diff
changeset
|
737 :group 'minibuffer) |
23e2e03f2bf6
(minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22157
diff
changeset
|
738 |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
739 (defun previous-matching-history-element (regexp n) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
740 "Find the previous history element that matches REGEXP. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
741 \(Previous history elements refer to earlier actions.) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
742 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
|
743 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
|
744 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
|
745 `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
|
746 makes the search case-sensitive. |
22257
23e2e03f2bf6
(minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22157
diff
changeset
|
747 See also `minibuffer-history-case-insensitive-variables'." |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
748 (interactive |
2681
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
749 (let* ((enable-recursive-minibuffers t) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
750 (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
|
751 nil |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
752 minibuffer-local-map |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
753 nil |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
754 'minibuffer-history-search-history))) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
755 ;; 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
|
756 (list (if (string= regexp "") |
11961
b5efbe330c86
(previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents:
11572
diff
changeset
|
757 (if minibuffer-history-search-history |
b5efbe330c86
(previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents:
11572
diff
changeset
|
758 (car minibuffer-history-search-history) |
b5efbe330c86
(previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents:
11572
diff
changeset
|
759 (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
|
760 regexp) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
761 (prefix-numeric-value current-prefix-arg)))) |
32897
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
762 (unless (zerop n) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
763 (if (and (zerop minibuffer-history-position) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
764 (null minibuffer-text-before-history)) |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
765 (setq minibuffer-text-before-history |
39612
309d26eb8616
(previous-matching-history-element): Fix misplaced parentheses.
Miles Bader <miles@gnu.org>
parents:
39597
diff
changeset
|
766 (minibuffer-contents-no-properties))) |
32897
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
767 (let ((history (symbol-value minibuffer-history-variable)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
768 (case-fold-search |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
769 (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
|
770 ;; On some systems, ignore case for file names. |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
771 (if (memq minibuffer-history-variable |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
772 minibuffer-history-case-insensitive-variables) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
773 t |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
774 ;; Respect the user's setting for case-fold-search: |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
775 case-fold-search) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
776 nil)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
777 prevpos |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
778 match-string |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
779 match-offset |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
780 (pos minibuffer-history-position)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
781 (while (/= n 0) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
782 (setq prevpos pos) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
783 (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
|
784 (when (= pos prevpos) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
785 (error (if (= pos 1) |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
786 "No later matching history item" |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
787 "No earlier matching history item"))) |
32897
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
788 (setq match-string |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
789 (if (eq minibuffer-history-sexp-flag (minibuffer-depth)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
790 (let ((print-level nil)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
791 (prin1-to-string (nth (1- pos) history))) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
792 (nth (1- pos) history))) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
793 (setq match-offset |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
794 (if (< n 0) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
795 (and (string-match regexp match-string) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
796 (match-end 0)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
797 (and (string-match (concat ".*\\(" regexp "\\)") match-string) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
798 (match-beginning 1)))) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
799 (when match-offset |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
800 (setq n (+ n (if (< n 0) 1 -1))))) |
32897
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
801 (setq minibuffer-history-position pos) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
802 (goto-char (point-max)) |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
803 (delete-minibuffer-contents) |
32897
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
804 (insert match-string) |
39612
309d26eb8616
(previous-matching-history-element): Fix misplaced parentheses.
Miles Bader <miles@gnu.org>
parents:
39597
diff
changeset
|
805 (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
|
806 (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
|
807 next-matching-history-element)) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
808 (setq command-history (cdr command-history)))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
809 |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
810 (defun next-matching-history-element (regexp n) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
811 "Find the next history element that matches REGEXP. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
812 \(The next history element refers to a more recent action.) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
813 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
|
814 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
|
815 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
|
816 `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
|
817 makes the search case-sensitive." |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
818 (interactive |
2681
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
819 (let* ((enable-recursive-minibuffers t) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
820 (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
|
821 nil |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
822 minibuffer-local-map |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
823 nil |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
824 'minibuffer-history-search-history))) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
825 ;; 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
|
826 (list (if (string= regexp "") |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
827 (setcar minibuffer-history-search-history |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
828 (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
|
829 regexp) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
830 (prefix-numeric-value current-prefix-arg)))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
831 (previous-matching-history-element regexp (- n))) |
475 | 832 |
32105
f80262435e6c
(minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents:
31978
diff
changeset
|
833 (defvar minibuffer-temporary-goal-position nil) |
f80262435e6c
(minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents:
31978
diff
changeset
|
834 |
858
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
835 (defun next-history-element (n) |
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
836 "Insert the next element of the minibuffer history into the minibuffer." |
475 | 837 (interactive "p") |
10722
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
838 (or (zerop n) |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
839 (let ((narg (- minibuffer-history-position n)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
840 (minimum (if minibuffer-default -1 0)) |
24814 | 841 elt minibuffer-returned-to-present) |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
842 (if (and (zerop minibuffer-history-position) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
843 (null minibuffer-text-before-history)) |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
844 (setq minibuffer-text-before-history |
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
845 (minibuffer-contents-no-properties))) |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
846 (if (< narg minimum) |
23472
d75fa19c5fc0
(next-history-element): Special error message if no default.
Richard M. Stallman <rms@gnu.org>
parents:
23471
diff
changeset
|
847 (if minibuffer-default |
d75fa19c5fc0
(next-history-element): Special error message if no default.
Richard M. Stallman <rms@gnu.org>
parents:
23471
diff
changeset
|
848 (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
|
849 (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
|
850 (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
|
851 (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
|
852 (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
|
853 previous-history-element)) |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
854 (let ((prompt-end (minibuffer-prompt-end))) |
32105
f80262435e6c
(minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents:
31978
diff
changeset
|
855 (set (make-local-variable 'minibuffer-temporary-goal-position) |
f80262435e6c
(minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents:
31978
diff
changeset
|
856 (cond ((<= (point) prompt-end) prompt-end) |
f80262435e6c
(minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents:
31978
diff
changeset
|
857 ((eobp) nil) |
f80262435e6c
(minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents:
31978
diff
changeset
|
858 (t (point)))))) |
26054 | 859 (goto-char (point-max)) |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
860 (delete-minibuffer-contents) |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
861 (setq minibuffer-history-position narg) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
862 (cond ((= narg -1) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
863 (setq elt minibuffer-default)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
864 ((= narg 0) |
19888
45a077538366
(next-history-element):
Richard M. Stallman <rms@gnu.org>
parents:
19514
diff
changeset
|
865 (setq elt (or minibuffer-text-before-history "")) |
24814 | 866 (setq minibuffer-returned-to-present t) |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
867 (setq minibuffer-text-before-history nil)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
868 (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
|
869 (symbol-value minibuffer-history-variable))))) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
870 (insert |
24814 | 871 (if (and (eq minibuffer-history-sexp-flag (minibuffer-depth)) |
872 (not minibuffer-returned-to-present)) | |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
873 (let ((print-level nil)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
874 (prin1-to-string elt)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
875 elt)) |
32105
f80262435e6c
(minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents:
31978
diff
changeset
|
876 (goto-char (or minibuffer-temporary-goal-position (point-max)))))) |
475 | 877 |
858
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
878 (defun previous-history-element (n) |
1145 | 879 "Inserts the previous element of the minibuffer history into the minibuffer." |
475 | 880 (interactive "p") |
859
5f325fbc093d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
858
diff
changeset
|
881 (next-history-element (- n))) |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
882 |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
883 (defun next-complete-history-element (n) |
26054 | 884 "Get next history element which completes the minibuffer before the point. |
885 The contents of the minibuffer after the point are deleted, and replaced | |
886 by the new completion." | |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
887 (interactive "p") |
1826
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
888 (let ((point-at-start (point))) |
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
889 (next-matching-history-element |
26054 | 890 (concat |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
891 "^" (regexp-quote (buffer-substring (minibuffer-prompt-end) (point)))) |
26054 | 892 n) |
1826
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
893 ;; 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
|
894 ;; 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
|
895 ;; 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
|
896 (goto-char point-at-start))) |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
897 |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
898 (defun previous-complete-history-element (n) |
5324
f091cdec77e2
(next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5151
diff
changeset
|
899 "\ |
26054 | 900 Get previous history element which completes the minibuffer before the point. |
901 The contents of the minibuffer after the point are deleted, and replaced | |
902 by the new completion." | |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
903 (interactive "p") |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
904 (next-complete-history-element (- n))) |
26054 | 905 |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
906 ;; For compatibility with the old subr of the same name. |
26054 | 907 (defun minibuffer-prompt-width () |
908 "Return the display width of the minibuffer prompt. | |
909 Return 0 if current buffer is not a mini-buffer." | |
910 ;; Return the width of everything before the field at the end of | |
911 ;; 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
|
912 (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
|
913 |
475 | 914 ;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
|
915 (defalias 'advertised-undo 'undo) |
475 | 916 |
917 (defun undo (&optional arg) | |
918 "Undo some previous changes. | |
919 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
|
920 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
|
921 |
32899
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
922 In Transient Mark mode when the mark is active, only undo changes within |
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
923 the current region. Similarly, when not in Transient Mark mode, just C-u |
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
924 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
|
925 (interactive "*P") |
41996
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
926 ;; 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
|
927 ;; 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
|
928 ;; 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
|
929 ;; 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
|
930 ;; 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
|
931 ;; you must type some other command. |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
932 (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
|
933 (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
|
934 (recent-save (recent-auto-save-p))) |
582 | 935 (or (eq (selected-window) (minibuffer-window)) |
936 (message "Undo!")) | |
32899
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
937 (unless (eq last-command 'undo) |
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
938 (if (if transient-mark-mode mark-active (and arg (not (numberp arg)))) |
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
939 (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
|
940 (undo-start)) |
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
941 ;; 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
|
942 (undo-more 1)) |
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
943 (undo-more |
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
944 (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
|
945 (prefix-numeric-value arg) |
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
946 1)) |
6386
1eabdff45c61
(undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents:
6237
diff
changeset
|
947 ;; 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
|
948 ;; 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
|
949 (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
|
950 (prev nil)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
951 (while (car tail) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
952 (when (integerp (car tail)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
953 (let ((pos (car tail))) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
954 (if (null prev) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
955 (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
|
956 (setcdr prev (cdr tail))) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
957 (setq tail (cdr tail)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
958 (while (car tail) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
959 (if (eq pos (car tail)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
960 (if prev |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
961 (setcdr prev (cdr tail)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
962 (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
|
963 (setq prev tail)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
964 (setq tail (cdr tail))) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
965 (setq tail nil))) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
966 (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
|
967 |
475 | 968 (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
|
969 (delete-auto-save-file-if-necessary recent-save)))) |
475 | 970 |
2947
518509536741
(pending-undo-list): Var declared.
Richard M. Stallman <rms@gnu.org>
parents:
2935
diff
changeset
|
971 (defvar pending-undo-list nil |
518509536741
(pending-undo-list): Var declared.
Richard M. Stallman <rms@gnu.org>
parents:
2935
diff
changeset
|
972 "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
|
973 |
22725
6d0f7798f157
(undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22375
diff
changeset
|
974 (defvar undo-in-progress nil |
6d0f7798f157
(undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22375
diff
changeset
|
975 "Non-nil while performing an undo. |
6d0f7798f157
(undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22375
diff
changeset
|
976 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
|
977 |
475 | 978 (defun undo-more (count) |
979 "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
|
980 Call `undo-start' to get ready to undo recent changes, |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
981 then call `undo-more' one or more times to undo them." |
475 | 982 (or pending-undo-list |
983 (error "No further undo information")) | |
22725
6d0f7798f157
(undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22375
diff
changeset
|
984 (let ((undo-in-progress t)) |
6d0f7798f157
(undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22375
diff
changeset
|
985 (setq pending-undo-list (primitive-undo count pending-undo-list)))) |
475 | 986 |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
987 ;; Deep copy of a list |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
988 (defun undo-copy-list (list) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
989 "Make a copy of undo list LIST." |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
990 (mapcar 'undo-copy-list-1 list)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
991 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
992 (defun undo-copy-list-1 (elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
993 (if (consp elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
994 (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
|
995 elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
996 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
997 (defun undo-start (&optional beg end) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
998 "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
|
999 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
|
1000 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
|
1001 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
|
1002 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
|
1003 (if (eq buffer-undo-list t) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1004 (error "No undo information in this buffer")) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1005 (setq pending-undo-list |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1006 (if (and beg end (not (= beg end))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1007 (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
|
1008 buffer-undo-list))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1009 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1010 (defvar undo-adjusted-markers) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1011 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1012 (defun undo-make-selective-list (start end) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1013 "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
|
1014 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
|
1015 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
|
1016 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
|
1017 we stop and ignore all further elements." |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1018 (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
|
1019 (undo-list (list nil)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1020 undo-adjusted-markers |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1021 some-rejected |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1022 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
|
1023 (while undo-list-copy |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1024 (setq undo-elt (car undo-list-copy)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1025 (let ((keep-this |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1026 (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
|
1027 ;; This is a "was unmodified" element. |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1028 ;; 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
|
1029 (not some-rejected)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1030 (t |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1031 (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
|
1032 (if keep-this |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1033 (progn |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1034 (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
|
1035 ;; 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
|
1036 (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
|
1037 (eq undo-elt nil))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1038 (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
|
1039 (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
|
1040 (setq undo-list-copy nil) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1041 (setq some-rejected t) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1042 (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
|
1043 (setq delta (undo-delta undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1044 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1045 (when (/= (cdr delta) 0) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1046 (let ((position (car delta)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1047 (offset (cdr delta))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1048 |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
1049 ;; 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
|
1050 ;; 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
|
1051 ;; 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
|
1052 ;; 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
|
1053 ;; 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
|
1054 ;; output |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1055 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1056 (while temp-undo-list |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1057 (setq undo-elt (car temp-undo-list)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1058 (cond ((integerp undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1059 (if (>= undo-elt position) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1060 (setcar temp-undo-list (- undo-elt offset)))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1061 ((atom undo-elt) nil) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1062 ((stringp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1063 ;; (TEXT . POSITION) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1064 (let ((text-pos (abs (cdr undo-elt))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1065 (point-at-end (< (cdr undo-elt) 0 ))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1066 (if (>= text-pos position) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1067 (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
|
1068 (- text-pos offset)))))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1069 ((integerp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1070 ;; (BEGIN . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1071 (when (>= (car undo-elt) position) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1072 (setcar undo-elt (- (car undo-elt) offset)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1073 (setcdr undo-elt (- (cdr undo-elt) offset)))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1074 ((null (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1075 ;; (nil PROPERTY VALUE BEG . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1076 (let ((tail (nthcdr 3 undo-elt))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1077 (when (>= (car tail) position) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1078 (setcar tail (- (car tail) offset)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1079 (setcdr tail (- (cdr tail) offset)))))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1080 (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
|
1081 (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
|
1082 (nreverse undo-list))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1083 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1084 (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
|
1085 "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
|
1086 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
|
1087 (cond ((integerp undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1088 (and (>= undo-elt start) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1089 (< undo-elt end))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1090 ((eq undo-elt nil) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1091 t) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1092 ((atom undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1093 nil) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1094 ((stringp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1095 ;; (TEXT . POSITION) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1096 (and (>= (abs (cdr undo-elt)) start) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1097 (< (abs (cdr undo-elt)) end))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1098 ((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
|
1099 ;; 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
|
1100 ;; See if MARKER is inside the region. |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1101 (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
|
1102 (unless alist-elt |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1103 (setq alist-elt (cons (car undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1104 (marker-position (car undo-elt)))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1105 (setq undo-adjusted-markers |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1106 (cons alist-elt undo-adjusted-markers))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1107 (and (cdr alist-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1108 (>= (cdr alist-elt) start) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1109 (< (cdr alist-elt) end)))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1110 ((null (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1111 ;; (nil PROPERTY VALUE BEG . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1112 (let ((tail (nthcdr 3 undo-elt))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1113 (and (>= (car tail) start) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1114 (< (cdr tail) end)))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1115 ((integerp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1116 ;; (BEGIN . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1117 (and (>= (car undo-elt) start) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1118 (< (cdr undo-elt) end))))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1119 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1120 (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
|
1121 "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
|
1122 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
|
1123 is not *inside* the region START...END." |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1124 (cond ((atom undo-elt) nil) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1125 ((null (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1126 ;; (nil PROPERTY VALUE BEG . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1127 (let ((tail (nthcdr 3 undo-elt))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1128 (not (or (< (car tail) end) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1129 (> (cdr tail) start))))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1130 ((integerp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1131 ;; (BEGIN . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1132 (not (or (< (car undo-elt) end) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1133 (> (cdr undo-elt) start)))))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1134 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1135 ;; 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
|
1136 ;; 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
|
1137 ;; the undo. |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1138 (defun undo-delta (undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1139 (if (consp undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1140 (cond ((stringp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1141 ;; (TEXT . POSITION) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1142 (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
|
1143 ((integerp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1144 ;; (BEGIN . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1145 (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
|
1146 (t |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1147 '(0 . 0))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1148 '(0 . 0))) |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
1149 |
4374
1a64d641cea4
(shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4289
diff
changeset
|
1150 (defvar shell-command-history nil |
1a64d641cea4
(shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4289
diff
changeset
|
1151 "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
|
1152 |
9779
1286985b5a26
(shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9771
diff
changeset
|
1153 (defvar shell-command-switch "-c" |
1286985b5a26
(shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9771
diff
changeset
|
1154 "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
|
1155 |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1156 (defvar shell-command-default-error-buffer nil |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1157 "*Buffer name for `shell-command' and `shell-command-on-region' error output. |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1158 This buffer is used when `shell-command' or 'shell-command-on-region' |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1159 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
|
1160 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
|
1161 |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1162 (defun shell-command (command &optional output-buffer error-buffer) |
475 | 1163 "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
|
1164 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
|
1165 |
475 | 1166 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
|
1167 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
|
1168 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
|
1169 |
33312
1e1d6d077288
(shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents:
32899
diff
changeset
|
1170 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
|
1171 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
|
1172 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
|
1173 `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
|
1174 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
|
1175 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
|
1176 |
19109
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
1177 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
|
1178 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
|
1179 before this command. |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
1180 |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
1181 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
|
1182 `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
|
1183 |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
1184 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
|
1185 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
|
1186 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
|
1187 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
|
1188 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
|
1189 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
|
1190 |
41996
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1191 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
|
1192 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
|
1193 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
|
1194 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
|
1195 \(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
|
1196 `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
|
1197 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
|
1198 |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1199 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
|
1200 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
|
1201 of the output. |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1202 |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1203 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
|
1204 then `*Shell Command Output*' is deleted. |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1205 |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1206 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
|
1207 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
|
1208 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
|
1209 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
|
1210 specifies the value of ERROR-BUFFER." |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1211 |
4488
b0a70d8d9af4
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
4477
diff
changeset
|
1212 (interactive (list (read-from-minibuffer "Shell command: " |
b0a70d8d9af4
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
4477
diff
changeset
|
1213 nil nil nil 'shell-command-history) |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1214 current-prefix-arg |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1215 shell-command-default-error-buffer)) |
14627
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1216 ;; 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
|
1217 (let ((handler |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1218 (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
|
1219 'shell-command))) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1220 (if handler |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1221 (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
|
1222 (if (and output-buffer |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1223 (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
|
1224 ;; Output goes in current buffer. |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1225 (let ((error-file |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1226 (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
|
1227 (make-temp-file |
25483
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
1228 (expand-file-name "scor" |
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
1229 (or small-temporary-file-directory |
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
1230 temporary-file-directory))) |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1231 nil))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1232 (barf-if-buffer-read-only) |
24825
f88179cfae99
(shell-command): Avoid printing "mark set" message.
Karl Heuer <kwzh@gnu.org>
parents:
24814
diff
changeset
|
1233 (push-mark nil t) |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1234 ;; 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
|
1235 ;; .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
|
1236 ;; "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
|
1237 ;; 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
|
1238 ;; 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
|
1239 (call-process shell-file-name nil |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1240 (if error-file |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1241 (list t error-file) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1242 t) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1243 nil shell-command-switch command) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1244 (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
|
1245 (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
|
1246 (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
|
1247 (let ((pos-from-end (- (point-max) (point)))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1248 (or (bobp) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1249 (insert "\f\n")) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1250 ;; Do no formatting while reading error file, |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1251 ;; 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
|
1252 ;; 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
|
1253 (format-insert-file error-file nil) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1254 ;; Put point after the inserted errors. |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1255 (goto-char (- (point-max) pos-from-end))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1256 (display-buffer (current-buffer)))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1257 (delete-file error-file)) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1258 ;; 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
|
1259 ;; 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
|
1260 ;; 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
|
1261 ;; because we inserted text. |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1262 (goto-char (prog1 (mark t) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1263 (set-marker (mark-marker) (point) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1264 (current-buffer))))) |
41996
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1265 ;; Output goes in a separate buffer. |
14627
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1266 ;; 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
|
1267 (save-match-data |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1268 (if (string-match "[ \t]*&[ \t]*$" command) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1269 ;; Command ending with ampersand means asynchronous. |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1270 (let ((buffer (get-buffer-create |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1271 (or output-buffer "*Async Shell Command*"))) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1272 (directory default-directory) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1273 proc) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1274 ;; Remove the ampersand. |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1275 (setq command (substring command 0 (match-beginning 0))) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1276 ;; If will kill a process, query first. |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1277 (setq proc (get-buffer-process buffer)) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1278 (if proc |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1279 (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
|
1280 (kill-process proc) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1281 (error "Shell command in progress"))) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1282 (save-excursion |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1283 (set-buffer buffer) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1284 (setq buffer-read-only nil) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1285 (erase-buffer) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1286 (display-buffer buffer) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1287 (setq default-directory directory) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1288 (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
|
1289 shell-command-switch command)) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1290 (setq mode-line-process '(":%s")) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1291 (require 'shell) (shell-mode) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1292 (set-process-sentinel proc 'shell-command-sentinel) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1293 )) |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1294 (shell-command-on-region (point) (point) command |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1295 output-buffer nil error-buffer))))))) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
1296 |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1297 (defun display-message-or-buffer (message |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1298 &optional buffer-name not-this-window frame) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1299 "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
|
1300 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
|
1301 |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1302 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
|
1303 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
|
1304 if `resize-mini-windows' is non-nil. |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1305 |
32260 | 1306 Returns either the string shown in the echo area, or when a pop-up |
1307 buffer is used, the window used to display it. | |
1308 | |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1309 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
|
1310 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
|
1311 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
|
1312 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
|
1313 the contents are inserted into the buffer anyway. |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1314 |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1315 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
|
1316 and only used if a buffer is displayed." |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1317 (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
|
1318 ;; 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
|
1319 (message "%s" message)) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1320 ((and (stringp message) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1321 (= (string-match "\n" message) (1- (length message)))) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1322 ;; 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
|
1323 (message "%s" (substring message 0 (1- (length message))))) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1324 (t |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1325 ;; General case |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1326 (with-current-buffer |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1327 (if (bufferp message) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1328 message |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1329 (get-buffer-create (or buffer-name "*Message*"))) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1330 |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1331 (unless (bufferp message) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1332 (erase-buffer) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1333 (insert message)) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1334 |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1335 (let ((lines |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1336 (if (= (buffer-size) 0) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1337 0 |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1338 (count-lines (point-min) (point-max))))) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1339 (cond ((or (<= lines 1) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1340 (<= lines |
33312
1e1d6d077288
(shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents:
32899
diff
changeset
|
1341 (if resize-mini-windows |
1e1d6d077288
(shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents:
32899
diff
changeset
|
1342 (cond ((floatp max-mini-window-height) |
1e1d6d077288
(shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents:
32899
diff
changeset
|
1343 (* (frame-height) |
1e1d6d077288
(shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents:
32899
diff
changeset
|
1344 max-mini-window-height)) |
1e1d6d077288
(shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents:
32899
diff
changeset
|
1345 ((integerp max-mini-window-height) |
1e1d6d077288
(shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents:
32899
diff
changeset
|
1346 max-mini-window-height) |
1e1d6d077288
(shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents:
32899
diff
changeset
|
1347 (t |
1e1d6d077288
(shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents:
32899
diff
changeset
|
1348 1)) |
1e1d6d077288
(shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents:
32899
diff
changeset
|
1349 1))) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1350 ;; Echo area |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1351 (goto-char (point-max)) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1352 (when (bolp) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1353 (backward-char 1)) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1354 (message "%s" (buffer-substring (point-min) (point)))) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1355 (t |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1356 ;; Buffer |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1357 (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
|
1358 (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
|
1359 not-this-window frame)))))))) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1360 |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1361 |
475 | 1362 ;; We have a sentinel to prevent insertion of a termination message |
1363 ;; in the buffer itself. | |
1364 (defun shell-command-sentinel (process signal) | |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
1365 (if (memq (process-status process) '(exit signal)) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1366 (message "%s: %s." |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
1367 (car (cdr (cdr (process-command process)))) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
1368 (substring signal 0 -1)))) |
475 | 1369 |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
1370 (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
|
1371 &optional output-buffer replace |
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
1372 error-buffer) |
475 | 1373 "Execute string COMMAND in inferior shell with region as input. |
1374 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
|
1375 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
|
1376 COMMAND. |
10852
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
1377 |
19109
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
1378 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
|
1379 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
|
1380 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
|
1381 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
|
1382 `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
|
1383 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
|
1384 |
23471
b6dbbd2cc3ac
(shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23450
diff
changeset
|
1385 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
|
1386 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
|
1387 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
|
1388 `coding-system-for-write'. |
475 | 1389 |
41996
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1390 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
|
1391 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
|
1392 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
|
1393 \(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
|
1394 `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
|
1395 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
|
1396 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
|
1397 |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1398 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
|
1399 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
|
1400 |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1401 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
|
1402 then `*Shell Command Output*' is deleted. |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
1403 |
10852
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
1404 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
|
1405 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
|
1406 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
|
1407 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
|
1408 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
|
1409 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
|
1410 |
23471
b6dbbd2cc3ac
(shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23450
diff
changeset
|
1411 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
|
1412 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
|
1413 around it. |
b6dbbd2cc3ac
(shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23450
diff
changeset
|
1414 |
23588
cec6b3f8f355
(shell-command-on-region): Doc fix.
Andreas Schwab <schwab@suse.de>
parents:
23520
diff
changeset
|
1415 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
|
1416 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
|
1417 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
|
1418 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
|
1419 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
|
1420 (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
|
1421 (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
|
1422 (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
|
1423 ;; 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
|
1424 ;; 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
|
1425 ;; 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
|
1426 (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
|
1427 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
|
1428 'shell-command-history)) |
13482
e49cd471ced7
(do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13328
diff
changeset
|
1429 ;; call-interactively recognizes region-beginning and |
e49cd471ced7
(do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13328
diff
changeset
|
1430 ;; 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
|
1431 (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
|
1432 string |
7b7874738e7c
(shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents:
10779
diff
changeset
|
1433 current-prefix-arg |
24106
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
1434 current-prefix-arg |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1435 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
|
1436 (let ((error-file |
25483
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
1437 (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
|
1438 (make-temp-file |
25483
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
1439 (expand-file-name "scor" |
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
1440 (or small-temporary-file-directory |
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
1441 temporary-file-directory))) |
24155
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
1442 nil)) |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
1443 exit-status) |
24106
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
1444 (if (or replace |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
1445 (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
|
1446 (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
|
1447 ;; 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
|
1448 (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
|
1449 ;; 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
|
1450 (goto-char start) |
43794
8acd1399d389
(shell-command-on-region): Call push-mark with
Eli Zaretskii <eliz@gnu.org>
parents:
43581
diff
changeset
|
1451 (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
|
1452 (setq exit-status |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
1453 (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
|
1454 (if error-file |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
1455 (list t error-file) |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
1456 t) |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
1457 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
|
1458 ;; 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
|
1459 ;; (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
|
1460 ;; (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
|
1461 ;; (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
|
1462 ;; 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
|
1463 (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
|
1464 ;; 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
|
1465 ;; replacing its entire contents. |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
1466 (let ((buffer (get-buffer-create |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
1467 (or output-buffer "*Shell Command Output*"))) |
24155
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
1468 (success nil)) |
24106
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
1469 (unwind-protect |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
1470 (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
|
1471 ;; 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
|
1472 ;; 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
|
1473 ;; 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
|
1474 (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
|
1475 (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
|
1476 (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
|
1477 (setq exit-status |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
1478 (call-process-region (point-min) (point-max) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1479 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
|
1480 (if error-file |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
1481 (list t error-file) |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
1482 t) |
24155
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
1483 nil shell-command-switch |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
1484 command))) |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
1485 ;; 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
|
1486 ;; output there. |
28703
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
1487 (let ((directory default-directory)) |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
1488 (save-excursion |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
1489 (set-buffer buffer) |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
1490 (setq buffer-read-only nil) |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
1491 (if (not output-buffer) |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
1492 (setq default-directory directory)) |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
1493 (erase-buffer))) |
24106
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
1494 (setq exit-status |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
1495 (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
|
1496 (if error-file |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
1497 (list buffer error-file) |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
1498 buffer) |
24155
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
1499 nil shell-command-switch command))) |
25147
820b95325cb5
(shell-command-on-region): EXIT-STATUS can be a string.
Richard M. Stallman <rms@gnu.org>
parents:
25046
diff
changeset
|
1500 (setq success (and exit-status (equal 0 exit-status))) |
41996
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1501 ;; Report the output. |
43581
d7536b0977ac
(shell-command-on-region): Report non-zero exit
Kim F. Storm <storm@cua.dk>
parents:
43436
diff
changeset
|
1502 (with-current-buffer buffer |
d7536b0977ac
(shell-command-on-region): Report non-zero exit
Kim F. Storm <storm@cua.dk>
parents:
43436
diff
changeset
|
1503 (setq mode-line-process |
d7536b0977ac
(shell-command-on-region): Report non-zero exit
Kim F. Storm <storm@cua.dk>
parents:
43436
diff
changeset
|
1504 (if (not success) |
d7536b0977ac
(shell-command-on-region): Report non-zero exit
Kim F. Storm <storm@cua.dk>
parents:
43436
diff
changeset
|
1505 (concat (format " - Exit [%d]" exit-status))))) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1506 (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
|
1507 ;; 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
|
1508 (display-message-or-buffer buffer) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1509 ;; 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
|
1510 (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
|
1511 (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
|
1512 (< 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
|
1513 "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
|
1514 "no output"))) |
1f1affb402ce
(shell-command-on-region): Display the exit status when a command fails.
Richard M. Stallman <rms@gnu.org>
parents:
43301
diff
changeset
|
1515 (if (equal 0 exit-status) |
1f1affb402ce
(shell-command-on-region): Display the exit status when a command fails.
Richard M. Stallman <rms@gnu.org>
parents:
43301
diff
changeset
|
1516 (message "(Shell command succeeded with %s)" |
1f1affb402ce
(shell-command-on-region): Display the exit status when a command fails.
Richard M. Stallman <rms@gnu.org>
parents:
43301
diff
changeset
|
1517 output) |
1f1affb402ce
(shell-command-on-region): Display the exit status when a command fails.
Richard M. Stallman <rms@gnu.org>
parents:
43301
diff
changeset
|
1518 (message "(Shell command failed with code %d and %s)" |
1f1affb402ce
(shell-command-on-region): Display the exit status when a command fails.
Richard M. Stallman <rms@gnu.org>
parents:
43301
diff
changeset
|
1519 exit-status output))) |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
1520 ;; 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
|
1521 ;; (kill-buffer buffer) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
1522 )))) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1523 |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1524 (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
|
1525 (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
|
1526 (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
|
1527 (let ((pos-from-end (- (point-max) (point)))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1528 (or (bobp) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1529 (insert "\f\n")) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1530 ;; Do no formatting while reading error file, |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1531 ;; 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
|
1532 ;; 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
|
1533 (format-insert-file error-file nil) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1534 ;; Put point after the inserted errors. |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1535 (goto-char (- (point-max) pos-from-end))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1536 (display-buffer (current-buffer)))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1537 (delete-file error-file)) |
24155
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
1538 exit-status)) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1539 |
16312
20690a1ec100
(shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16018
diff
changeset
|
1540 (defun shell-command-to-string (command) |
20690a1ec100
(shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16018
diff
changeset
|
1541 "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
|
1542 (with-output-to-string |
16316
50be5f6cb5e6
(shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents:
16312
diff
changeset
|
1543 (with-current-buffer |
50be5f6cb5e6
(shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents:
16312
diff
changeset
|
1544 standard-output |
50be5f6cb5e6
(shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents:
16312
diff
changeset
|
1545 (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
|
1546 |
16685
26919ad3a4ad
Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16632
diff
changeset
|
1547 (defvar universal-argument-map |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1548 (let ((map (make-sparse-keymap))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1549 (define-key map [t] 'universal-argument-other-key) |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
1550 (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
|
1551 (define-key map [switch-frame] nil) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1552 (define-key map [?\C-u] 'universal-argument-more) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1553 (define-key map [?-] 'universal-argument-minus) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1554 (define-key map [?0] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1555 (define-key map [?1] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1556 (define-key map [?2] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1557 (define-key map [?3] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1558 (define-key map [?4] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1559 (define-key map [?5] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1560 (define-key map [?6] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1561 (define-key map [?7] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1562 (define-key map [?8] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1563 (define-key map [?9] 'digit-argument) |
30347
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
1564 (define-key map [kp-0] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
1565 (define-key map [kp-1] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
1566 (define-key map [kp-2] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
1567 (define-key map [kp-3] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
1568 (define-key map [kp-4] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
1569 (define-key map [kp-5] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
1570 (define-key map [kp-6] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
1571 (define-key map [kp-7] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
1572 (define-key map [kp-8] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
1573 (define-key map [kp-9] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
1574 (define-key map [kp-subtract] 'universal-argument-minus) |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1575 map) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1576 "Keymap used while processing \\[universal-argument].") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1577 |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1578 (defvar universal-argument-num-events nil |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1579 "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
|
1580 `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
|
1581 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
|
1582 |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1583 (defun universal-argument () |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1584 "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
|
1585 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
|
1586 \\[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
|
1587 \\[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
|
1588 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
|
1589 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
|
1590 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
|
1591 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
|
1592 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
|
1593 (interactive) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1594 (setq prefix-arg (list 4)) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1595 (setq universal-argument-num-events (length (this-command-keys))) |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1596 (setq overriding-terminal-local-map universal-argument-map)) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1597 |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1598 ;; 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
|
1599 ;; 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
|
1600 (defun universal-argument-more (arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1601 (interactive "P") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1602 (if (consp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1603 (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
|
1604 (if (eq arg '-) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
1605 (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
|
1606 (setq prefix-arg arg) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
1607 (setq overriding-terminal-local-map nil))) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1608 (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
|
1609 |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1610 (defun negative-argument (arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1611 "Begin a negative numeric argument for the next command. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1612 \\[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
|
1613 (interactive "P") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1614 (cond ((integerp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1615 (setq prefix-arg (- arg))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1616 ((eq arg '-) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1617 (setq prefix-arg nil)) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1618 (t |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
1619 (setq prefix-arg '-))) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1620 (setq universal-argument-num-events (length (this-command-keys))) |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
1621 (setq overriding-terminal-local-map universal-argument-map)) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1622 |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1623 (defun digit-argument (arg) |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1624 "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
|
1625 \\[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
|
1626 (interactive "P") |
30347
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
1627 (let* ((char (if (integerp last-command-char) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
1628 last-command-char |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
1629 (get last-command-char 'ascii-character))) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
1630 (digit (- (logand char ?\177) ?0))) |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1631 (cond ((integerp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1632 (setq prefix-arg (+ (* arg 10) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1633 (if (< arg 0) (- digit) digit)))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1634 ((eq arg '-) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1635 ;; Treat -0 as just -, so that -01 will work. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1636 (setq prefix-arg (if (zerop digit) '- (- digit)))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1637 (t |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
1638 (setq prefix-arg digit)))) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1639 (setq universal-argument-num-events (length (this-command-keys))) |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
1640 (setq overriding-terminal-local-map universal-argument-map)) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1641 |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1642 ;; 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
|
1643 ;; command if digits have already been entered. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1644 (defun universal-argument-minus (arg) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
1645 (interactive "P") |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1646 (if (integerp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1647 (universal-argument-other-key arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1648 (negative-argument arg))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1649 |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1650 ;; 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
|
1651 ;; executed as a command. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1652 (defun universal-argument-other-key (arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1653 (interactive "P") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1654 (setq prefix-arg arg) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1655 (let* ((key (this-command-keys)) |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1656 (keylist (listify-key-sequence key))) |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
1657 (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
|
1658 (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
|
1659 unread-command-events))) |
12320
979836b1a1a9
(universal-argument-other-key): Call reset-this-command-lengths.
Richard M. Stallman <rms@gnu.org>
parents:
12313
diff
changeset
|
1660 (reset-this-command-lengths) |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
1661 (setq overriding-terminal-local-map nil)) |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
1662 |
715 | 1663 ;;;; Window system cut and paste hooks. |
1664 | |
1665 (defvar interprogram-cut-function nil | |
1666 "Function to call to make a killed region available to other programs. | |
1667 | |
1668 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
|
1669 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
|
1670 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
|
1671 is put in the kill ring, to make the new kill available to other |
715 | 1672 programs. |
1673 | |
3034
dd65780e6246
(kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents:
3029
diff
changeset
|
1674 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
|
1675 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
|
1676 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
|
1677 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
|
1678 nil means appending to an \"old\" kill.") |
715 | 1679 |
1680 (defvar interprogram-paste-function nil | |
1681 "Function to call to get text cut from other programs. | |
1682 | |
1683 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
|
1684 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
|
1685 This variable holds a function that Emacs calls to obtain |
715 | 1686 text that other programs have provided for pasting. |
1687 | |
1688 The function should be called with no arguments. If the function | |
1689 returns nil, then no other program has provided such text, and the top | |
1690 of the Emacs kill ring should be used. If the function returns a | |
727 | 1691 string, that string should be put in the kill ring as the latest kill. |
1692 | |
1693 Note that the function should return a string only if a program other | |
1694 than Emacs has provided a string for pasting; if Emacs provided the | |
1695 most recent string, the function should return nil. If it is | |
1696 difficult to tell whether Emacs or some other program provided the | |
1697 current string, it is probably good enough to return nil if the string | |
1698 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
|
1699 |
715 | 1700 |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
1701 |
715 | 1702 ;;;; The kill ring data structure. |
475 | 1703 |
1704 (defvar kill-ring nil | |
715 | 1705 "List of killed text sequences. |
1706 Since the kill ring is supposed to interact nicely with cut-and-paste | |
1707 facilities offered by window systems, use of this variable should | |
1708 interact nicely with `interprogram-cut-function' and | |
1709 `interprogram-paste-function'. The functions `kill-new', | |
1710 `kill-append', and `current-kill' are supposed to implement this | |
1711 interaction; you may want to use them instead of manipulating the kill | |
1712 ring directly.") | |
475 | 1713 |
23495
d5f08ad9a40b
(kill-ring-max): Increased to 60.
Richard M. Stallman <rms@gnu.org>
parents:
23491
diff
changeset
|
1714 (defcustom kill-ring-max 60 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1715 "*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
|
1716 :type 'integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1717 :group 'killing) |
475 | 1718 |
1719 (defvar kill-ring-yank-pointer nil | |
1720 "The tail of the kill ring whose car is the last thing yanked.") | |
1721 | |
8763
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1722 (defun kill-new (string &optional replace) |
715 | 1723 "Make STRING the latest kill in the kill ring. |
44273 | 1724 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
|
1725 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
|
1726 Optional second argument REPLACE non-nil means that STRING will replace |
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1727 the front of the kill ring, rather than being added to the list." |
8768
e2073805b688
(kill-new): Call menu-bar-update-yank-menu only if that function is defined.
Karl Heuer <kwzh@gnu.org>
parents:
8763
diff
changeset
|
1728 (and (fboundp 'menu-bar-update-yank-menu) |
e2073805b688
(kill-new): Call menu-bar-update-yank-menu only if that function is defined.
Karl Heuer <kwzh@gnu.org>
parents:
8763
diff
changeset
|
1729 (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
|
1730 (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
|
1731 (setcar kill-ring string) |
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1732 (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
|
1733 (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
|
1734 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil))) |
715 | 1735 (setq kill-ring-yank-pointer kill-ring) |
1736 (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
|
1737 (funcall interprogram-cut-function string (not replace)))) |
715 | 1738 |
475 | 1739 (defun kill-append (string before-p) |
715 | 1740 "Append STRING to the end of the latest kill in the kill ring. |
1741 If BEFORE-P is non-nil, prepend STRING to the kill. | |
1760 | 1742 If `interprogram-cut-function' is set, pass the resulting kill to |
715 | 1743 it." |
8763
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1744 (kill-new (if before-p |
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
1745 (concat string (car kill-ring)) |
42660 | 1746 (concat (car kill-ring) string)) |
1747 t)) | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
1748 |
715 | 1749 (defun current-kill (n &optional do-not-move) |
1750 "Rotate the yanking point by N places, and then return that kill. | |
1751 If N is zero, `interprogram-paste-function' is set, and calling it | |
1752 returns a string, then that string is added to the front of the | |
1753 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
|
1754 If optional arg DO-NOT-MOVE is non-nil, then don't actually move the |
715 | 1755 yanking point; just return the Nth kill forward." |
1756 (let ((interprogram-paste (and (= n 0) | |
1757 interprogram-paste-function | |
1758 (funcall interprogram-paste-function)))) | |
1759 (if interprogram-paste | |
1760 (progn | |
1761 ;; Disable the interprogram cut function when we add the new | |
1762 ;; text to the kill ring, so Emacs doesn't try to own the | |
1763 ;; selection, with identical text. | |
1764 (let ((interprogram-cut-function nil)) | |
1765 (kill-new interprogram-paste)) | |
1766 interprogram-paste) | |
1767 (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
|
1768 (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
|
1769 (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
|
1770 (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
|
1771 kill-ring))) |
715 | 1772 (or do-not-move |
1773 (setq kill-ring-yank-pointer ARGth-kill-element)) | |
1774 (car ARGth-kill-element))))) | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
1775 |
715 | 1776 |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
1777 |
715 | 1778 ;;;; Commands for manipulating the kill ring. |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
1779 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1780 (defcustom kill-read-only-ok nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1781 "*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
|
1782 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
1783 :group 'killing) |
7063
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
1784 |
14507
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
1785 (put 'text-read-only 'error-conditions |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
1786 '(text-read-only buffer-read-only error)) |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
1787 (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
|
1788 |
475 | 1789 (defun kill-region (beg end) |
1790 "Kill between point and mark. | |
1791 The text is deleted but saved in the kill ring. | |
1792 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
|
1793 \(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
|
1794 |
116beb1b2fc7
(kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
36030
diff
changeset
|
1795 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
|
1796 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
|
1797 |
1834
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
1798 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
|
1799 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
|
1800 you can use the killing commands to copy text from a read-only buffer. |
475 | 1801 |
1802 This is the primitive for programs to kill text (as opposed to deleting it). | |
1803 Supply two arguments, character numbers indicating the stretch of text | |
1804 to be killed. | |
1805 Any command that calls this function is a \"kill command\". | |
1806 If the previous command was also a kill command, | |
1807 the text killed this time appends to the text killed last time | |
1808 to make one entry in the kill ring." | |
27836
132294fa754e
(zap-to-char, kill-line, kill-region, kill-word)
Dave Love <fx@gnu.org>
parents:
27477
diff
changeset
|
1809 (interactive "r") |
20279
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
1810 (condition-case nil |
26744
f14026cd9767
(kill-region): Use the new `delete-and-extract-region'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26723
diff
changeset
|
1811 (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
|
1812 (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
|
1813 ;; 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
|
1814 (if (eq last-command 'kill-region) |
f14026cd9767
(kill-region): Use the new `delete-and-extract-region'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26723
diff
changeset
|
1815 (kill-append string (< end beg)) |
f14026cd9767
(kill-region): Use the new `delete-and-extract-region'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26723
diff
changeset
|
1816 (kill-new string))) |
20279
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
1817 (setq this-command 'kill-region)) |
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
1818 ((buffer-read-only text-read-only) |
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
1819 ;; 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
|
1820 ;; in the region, are read-only. |
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
1821 ;; 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
|
1822 ;; However, there's no harm in putting |
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
1823 ;; 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
|
1824 (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
|
1825 ;; 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
|
1826 (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
|
1827 ;; 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
|
1828 (if kill-read-only-ok |
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
1829 (message "Read only text copied to kill ring") |
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
1830 ;; 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
|
1831 (barf-if-buffer-read-only) |
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
1832 ;; 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
|
1833 (signal 'text-read-only (list (current-buffer))))))) |
475 | 1834 |
9876
75ecf866cfb8
Comment reason for preceding change.
Karl Heuer <kwzh@gnu.org>
parents:
9870
diff
changeset
|
1835 ;; 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
|
1836 ;; 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
|
1837 ;; then corrects it with the intended C-w. |
475 | 1838 (defun copy-region-as-kill (beg end) |
1839 "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
|
1840 In Transient Mark mode, deactivate the mark. |
617 | 1841 If `interprogram-cut-function' is non-nil, also save the text for a window |
1842 system cut and paste." | |
475 | 1843 (interactive "r") |
1844 (if (eq last-command 'kill-region) | |
1845 (kill-append (buffer-substring beg end) (< end beg)) | |
715 | 1846 (kill-new (buffer-substring beg end))) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1847 (if transient-mark-mode |
21193
20bba919ec72
(copy-region-as-kill): Set deactivate-mark
Richard M. Stallman <rms@gnu.org>
parents:
21175
diff
changeset
|
1848 (setq deactivate-mark t)) |
475 | 1849 nil) |
1850 | |
1851 (defun kill-ring-save (beg end) | |
2111
d38d32084c15
* simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2075
diff
changeset
|
1852 "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
|
1853 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
|
1854 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
|
1855 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
|
1856 |
36110
116beb1b2fc7
(kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
36030
diff
changeset
|
1857 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
|
1858 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
|
1859 |
3467
002945794814
(kill-ring-save): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
3408
diff
changeset
|
1860 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
|
1861 visual feedback indicating the extent of the region being copied." |
475 | 1862 (interactive "r") |
1863 (copy-region-as-kill beg end) | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
1864 (if (interactive-p) |
2850
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1865 (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
|
1866 (opoint (point)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1867 ;; 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
|
1868 ;; 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
|
1869 (inhibit-quit t)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1870 (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
|
1871 (unless transient-mark-mode |
2850
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1872 ;; Swap point and mark. |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1873 (set-marker (mark-marker) (point) (current-buffer)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1874 (goto-char other-end) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1875 (sit-for 1) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1876 ;; Swap back. |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1877 (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
|
1878 (goto-char opoint) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1879 ;; If user quit, deactivate the mark |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1880 ;; 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
|
1881 (and quit-flag mark-active |
4287
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
1882 (deactivate-mark))) |
2850
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1883 (let* ((killed-text (current-kill 0)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1884 (message-len (min (length killed-text) 40))) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1885 (if (= (point) beg) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1886 ;; Don't say "killed"; that is misleading. |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1887 (message "Saved text until \"%s\"" |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1888 (substring killed-text (- message-len))) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1889 (message "Saved text from \"%s\"" |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
1890 (substring killed-text 0 message-len)))))))) |
475 | 1891 |
24798
6fe40d35360e
(append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents:
24789
diff
changeset
|
1892 (defun append-next-kill (&optional interactive) |
6fe40d35360e
(append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents:
24789
diff
changeset
|
1893 "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
|
1894 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
|
1895 (interactive "p") |
6fe40d35360e
(append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents:
24789
diff
changeset
|
1896 ;; 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
|
1897 (if interactive |
475 | 1898 (progn |
1899 (setq this-command 'kill-region) | |
1900 (message "If the next command is a kill, it will append")) | |
1901 (setq last-command 'kill-region))) | |
44667
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
1902 |
25292 | 1903 ;; Yanking. |
475 | 1904 |
44667
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
1905 ;; 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
|
1906 (defcustom yank-excluded-properties |
44981
9aadbf05db26
(yank-excluded-properties): Added help-echo to list.
Kim F. Storm <storm@cua.dk>
parents:
44906
diff
changeset
|
1907 '(read-only invisible intangible field mouse-face help-echo local-map keymap) |
44667
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
1908 "*Text properties to discard when yanking." |
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
1909 :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
|
1910 :group 'editing |
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
1911 :version 21.4) |
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
1912 |
475 | 1913 (defun yank-pop (arg) |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1914 "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
|
1915 This command is allowed only immediately after a `yank' or a `yank-pop'. |
475 | 1916 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
|
1917 previously-killed text. `yank-pop' deletes that text and inserts in its |
475 | 1918 place a different stretch of killed text. |
1919 | |
1920 With no argument, the previous kill is inserted. | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1921 With argument N, insert the Nth previous kill. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1922 If N is negative, this is a more recent kill. |
475 | 1923 |
1924 The sequence of kills wraps around, so that after the oldest one | |
1925 comes the newest one." | |
1926 (interactive "*p") | |
1927 (if (not (eq last-command 'yank)) | |
1928 (error "Previous command was not a yank")) | |
1929 (setq this-command 'yank) | |
14507
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
1930 (let ((inhibit-read-only t) |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
1931 (before (< (point) (mark t)))) |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
1932 (delete-region (point) (mark t)) |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1933 (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
|
1934 (insert-for-yank (current-kill arg)) |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1935 (if before |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1936 ;; 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
|
1937 ;; 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
|
1938 ;; 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
|
1939 (goto-char (prog1 (mark t) |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1940 (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
|
1941 nil) |
475 | 1942 |
1943 (defun yank (&optional arg) | |
1944 "Reinsert the last stretch of killed text. | |
1945 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
|
1946 killed OR yanked. Put point at end, and set mark at beginning. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1947 With just C-u as argument, same but put point at beginning (and mark at end). |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1948 With argument N, reinsert the Nth most recently killed stretch of killed |
475 | 1949 text. |
1950 See also the command \\[yank-pop]." | |
1951 (interactive "*P") | |
5935
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
1952 ;; 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
|
1953 ;; for the following command. |
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
1954 (setq this-command t) |
475 | 1955 (push-mark (point)) |
44667
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
1956 (insert-for-yank (current-kill (cond |
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
1957 ((listp arg) 0) |
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
1958 ((eq arg '-) -1) |
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
1959 (t (1- arg))))) |
475 | 1960 (if (consp arg) |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1961 ;; 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
|
1962 ;; 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
|
1963 ;; 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
|
1964 (goto-char (prog1 (mark t) |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
1965 (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
|
1966 ;; If we do get all the way thru, make this-command indicate that. |
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
1967 (setq this-command 'yank) |
2111
d38d32084c15
* simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2075
diff
changeset
|
1968 nil) |
715 | 1969 |
1970 (defun rotate-yank-pointer (arg) | |
1971 "Rotate the yanking point in the kill ring. | |
1972 With argument, rotate that many kills forward (or backward, if negative)." | |
1973 (interactive "p") | |
1974 (current-kill arg)) | |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
1975 |
25292 | 1976 ;; Some kill commands. |
1977 | |
1978 ;; Internal subroutine of delete-char | |
1979 (defun kill-forward-chars (arg) | |
1980 (if (listp arg) (setq arg (car arg))) | |
1981 (if (eq arg '-) (setq arg -1)) | |
1982 (kill-region (point) (forward-point arg))) | |
1983 | |
1984 ;; Internal subroutine of backward-delete-char | |
1985 (defun kill-backward-chars (arg) | |
1986 (if (listp arg) (setq arg (car arg))) | |
1987 (if (eq arg '-) (setq arg -1)) | |
1988 (kill-region (point) (forward-point (- arg)))) | |
1989 | |
1990 (defcustom backward-delete-char-untabify-method 'untabify | |
1991 "*The method for untabifying when deleting backward. | |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1992 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
|
1993 `hungry' -- delete all whitespace, both tabs and spaces; |
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1994 `all' -- delete all whitespace, including tabs, spaces and newlines; |
25292 | 1995 nil -- just delete one character." |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1996 :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
|
1997 :version "20.3" |
25292 | 1998 :group 'killing) |
1999 | |
2000 (defun backward-delete-char-untabify (arg &optional killp) | |
2001 "Delete characters backward, changing tabs into spaces. | |
2002 The exact behavior depends on `backward-delete-char-untabify-method'. | |
2003 Delete ARG chars, and kill (save in kill ring) if KILLP is non-nil. | |
2004 Interactively, ARG is the prefix arg (default 1) | |
2005 and KILLP is t if a prefix arg was specified." | |
2006 (interactive "*p\nP") | |
2007 (when (eq backward-delete-char-untabify-method 'untabify) | |
2008 (let ((count arg)) | |
2009 (save-excursion | |
2010 (while (and (> count 0) (not (bobp))) | |
2011 (if (= (preceding-char) ?\t) | |
2012 (let ((col (current-column))) | |
2013 (forward-char -1) | |
2014 (setq col (- col (current-column))) | |
2015 (insert-char ?\ col) | |
2016 (delete-char 1))) | |
2017 (forward-char -1) | |
2018 (setq count (1- count)))))) | |
2019 (delete-backward-char | |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2020 (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
|
2021 ((eq backward-delete-char-untabify-method 'all) |
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2022 " \t\n\r")))) |
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2023 (if skip |
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2024 (let ((wh (- (point) (save-excursion (skip-chars-backward skip) |
25292 | 2025 (point))))) |
2026 (+ arg (if (zerop wh) 0 (1- wh)))) | |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2027 arg)) |
25292 | 2028 killp)) |
2029 | |
2030 (defun zap-to-char (arg char) | |
2031 "Kill up to and including ARG'th occurrence of CHAR. | |
2032 Case is ignored if `case-fold-search' is non-nil in the current buffer. | |
2033 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
|
2034 (interactive "p\ncZap to char: ") |
25292 | 2035 (kill-region (point) (progn |
2036 (search-forward (char-to-string char) nil nil arg) | |
2037 ; (goto-char (if (> arg 0) (1- (point)) (1+ (point)))) | |
2038 (point)))) | |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
2039 |
25292 | 2040 ;; kill-line and its subroutines. |
2041 | |
2042 (defcustom kill-whole-line nil | |
2043 "*If non-nil, `kill-line' with no arg at beg of line kills the whole line." | |
2044 :type 'boolean | |
2045 :group 'killing) | |
2046 | |
2047 (defun kill-line (&optional arg) | |
2048 "Kill the rest of the current line; if no nonblanks there, kill thru newline. | |
2049 With prefix argument, kill that many lines from point. | |
2050 Negative arguments kill lines backward. | |
32267 | 2051 With zero argument, kills the text before point on the current line. |
25292 | 2052 |
2053 When calling from a program, nil means \"no arg\", | |
2054 a number counts as a prefix arg. | |
2055 | |
2056 To kill a whole line, when point is not at the beginning, type \ | |
2057 \\[beginning-of-line] \\[kill-line] \\[kill-line]. | |
2058 | |
2059 If `kill-whole-line' is non-nil, then this command kills the whole line | |
2060 including its terminating newline, when used at the beginning of a line | |
2061 with no argument. As a consequence, you can always kill a whole line | |
35916 | 2062 by typing \\[beginning-of-line] \\[kill-line]. |
2063 | |
36110
116beb1b2fc7
(kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
36030
diff
changeset
|
2064 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
|
2065 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
|
2066 |
35916 | 2067 If the buffer is read-only, Emacs will beep and refrain from deleting |
2068 the line, but put the line in the kill ring anyway. This means that | |
2069 you can use this command to copy text from a read-only buffer." | |
27836
132294fa754e
(zap-to-char, kill-line, kill-region, kill-word)
Dave Love <fx@gnu.org>
parents:
27477
diff
changeset
|
2070 (interactive "P") |
25292 | 2071 (kill-region (point) |
2072 ;; It is better to move point to the other end of the kill | |
2073 ;; before killing. That way, in a read-only buffer, point | |
2074 ;; moves across the text that is copied to the kill ring. | |
2075 ;; The choice has no effect on undo now that undo records | |
2076 ;; the value of point from before the command was run. | |
2077 (progn | |
2078 (if arg | |
2079 (forward-visible-line (prefix-numeric-value arg)) | |
2080 (if (eobp) | |
2081 (signal 'end-of-buffer nil)) | |
2082 (if (or (looking-at "[ \t]*$") (and kill-whole-line (bolp))) | |
2083 (forward-visible-line 1) | |
2084 (end-of-visible-line))) | |
2085 (point)))) | |
2086 | |
2087 (defun forward-visible-line (arg) | |
2088 "Move forward by ARG lines, ignoring currently invisible newlines only. | |
2089 If ARG is negative, move backward -ARG lines. | |
2090 If ARG is zero, move to the beginning of the current line." | |
2091 (condition-case nil | |
2092 (if (> arg 0) | |
2093 (while (> arg 0) | |
2094 (or (zerop (forward-line 1)) | |
2095 (signal 'end-of-buffer nil)) | |
2096 ;; If the following character is currently invisible, | |
2097 ;; skip all characters with that same `invisible' property value, | |
2098 ;; then find the next newline. | |
2099 (while (and (not (eobp)) | |
2100 (let ((prop | |
2101 (get-char-property (point) 'invisible))) | |
2102 (if (eq buffer-invisibility-spec t) | |
2103 prop | |
2104 (or (memq prop buffer-invisibility-spec) | |
2105 (assq prop buffer-invisibility-spec))))) | |
2106 (goto-char | |
2107 (if (get-text-property (point) 'invisible) | |
2108 (or (next-single-property-change (point) 'invisible) | |
2109 (point-max)) | |
2110 (next-overlay-change (point)))) | |
2111 (or (zerop (forward-line 1)) | |
2112 (signal 'end-of-buffer nil))) | |
2113 (setq arg (1- arg))) | |
2114 (let ((first t)) | |
2115 (while (or first (< arg 0)) | |
2116 (if (zerop arg) | |
2117 (beginning-of-line) | |
2118 (or (zerop (forward-line -1)) | |
2119 (signal 'beginning-of-buffer nil))) | |
2120 (while (and (not (bobp)) | |
2121 (let ((prop | |
2122 (get-char-property (1- (point)) 'invisible))) | |
2123 (if (eq buffer-invisibility-spec t) | |
2124 prop | |
2125 (or (memq prop buffer-invisibility-spec) | |
2126 (assq prop buffer-invisibility-spec))))) | |
2127 (goto-char | |
2128 (if (get-text-property (1- (point)) 'invisible) | |
2129 (or (previous-single-property-change (point) 'invisible) | |
2130 (point-min)) | |
2131 (previous-overlay-change (point)))) | |
2132 (or (zerop (forward-line -1)) | |
2133 (signal 'beginning-of-buffer nil))) | |
2134 (setq first nil) | |
2135 (setq arg (1+ arg))))) | |
2136 ((beginning-of-buffer end-of-buffer) | |
2137 nil))) | |
2138 | |
2139 (defun end-of-visible-line () | |
2140 "Move to end of current visible line." | |
2141 (end-of-line) | |
2142 ;; If the following character is currently invisible, | |
2143 ;; skip all characters with that same `invisible' property value, | |
2144 ;; then find the next newline. | |
2145 (while (and (not (eobp)) | |
2146 (let ((prop | |
2147 (get-char-property (point) 'invisible))) | |
2148 (if (eq buffer-invisibility-spec t) | |
2149 prop | |
2150 (or (memq prop buffer-invisibility-spec) | |
2151 (assq prop buffer-invisibility-spec))))) | |
2152 (if (get-text-property (point) 'invisible) | |
2153 (goto-char (next-single-property-change (point) 'invisible)) | |
2154 (goto-char (next-overlay-change (point)))) | |
2155 (end-of-line))) | |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
2156 |
475 | 2157 (defun insert-buffer (buffer) |
2158 "Insert after point the contents of BUFFER. | |
2159 Puts mark after the inserted text. | |
26723 | 2160 BUFFER may be a buffer or a buffer name. |
2161 | |
2162 This function is meant for the user to run interactively. | |
2163 Don't call it from programs!" | |
14835
eb78ddcff331
(insert-buffer): Fix typo in previous change.
Erik Naggum <erik@naggum.no>
parents:
14834
diff
changeset
|
2164 (interactive |
14834
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
2165 (list |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
2166 (progn |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
2167 (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
|
2168 (read-buffer "Insert buffer: " |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
2169 (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
|
2170 (other-buffer (current-buffer)) |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
2171 (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
|
2172 t)))) |
475 | 2173 (or (bufferp buffer) |
2174 (setq buffer (get-buffer buffer))) | |
2175 (let (start end newmark) | |
2176 (save-excursion | |
2177 (save-excursion | |
2178 (set-buffer buffer) | |
2179 (setq start (point-min) end (point-max))) | |
2180 (insert-buffer-substring buffer start end) | |
2181 (setq newmark (point))) | |
1982
d65c1fefc636
* simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents:
1838
diff
changeset
|
2182 (push-mark newmark)) |
d65c1fefc636
* simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents:
1838
diff
changeset
|
2183 nil) |
475 | 2184 |
2185 (defun append-to-buffer (buffer start end) | |
2186 "Append to specified buffer the text of the region. | |
2187 It is inserted into that buffer before its point. | |
2188 | |
2189 When calling from a program, give three arguments: | |
2190 BUFFER (or buffer name), START and END. | |
2191 START and END specify the portion of the current buffer to be copied." | |
715 | 2192 (interactive |
10048
db01a04d2afb
(append-to-buffer): Don't use current buffer as default.
Richard M. Stallman <rms@gnu.org>
parents:
10034
diff
changeset
|
2193 (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
|
2194 (region-beginning) (region-end))) |
475 | 2195 (let ((oldbuf (current-buffer))) |
2196 (save-excursion | |
28187
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
2197 (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
|
2198 (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
|
2199 point) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
2200 (set-buffer append-to) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
2201 (setq point (point)) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
2202 (barf-if-buffer-read-only) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
2203 (insert-buffer-substring oldbuf start end) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
2204 (dolist (window windows) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
2205 (when (= (window-point window) point) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
2206 (set-window-point window (point)))))))) |
475 | 2207 |
2208 (defun prepend-to-buffer (buffer start end) | |
2209 "Prepend to specified buffer the text of the region. | |
2210 It is inserted into that buffer after its point. | |
2211 | |
2212 When calling from a program, give three arguments: | |
2213 BUFFER (or buffer name), START and END. | |
2214 START and END specify the portion of the current buffer to be copied." | |
2215 (interactive "BPrepend to buffer: \nr") | |
2216 (let ((oldbuf (current-buffer))) | |
2217 (save-excursion | |
2218 (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
|
2219 (barf-if-buffer-read-only) |
475 | 2220 (save-excursion |
2221 (insert-buffer-substring oldbuf start end))))) | |
2222 | |
2223 (defun copy-to-buffer (buffer start end) | |
2224 "Copy to specified buffer the text of the region. | |
2225 It is inserted into that buffer, replacing existing text there. | |
2226 | |
2227 When calling from a program, give three arguments: | |
2228 BUFFER (or buffer name), START and END. | |
2229 START and END specify the portion of the current buffer to be copied." | |
2230 (interactive "BCopy to buffer: \nr") | |
2231 (let ((oldbuf (current-buffer))) | |
2232 (save-excursion | |
2233 (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
|
2234 (barf-if-buffer-read-only) |
475 | 2235 (erase-buffer) |
2236 (save-excursion | |
2237 (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
|
2238 |
4040
d06d7295d3eb
Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents:
3967
diff
changeset
|
2239 (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
|
2240 (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
|
2241 |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
2242 (defun mark (&optional force) |
3487 | 2243 "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
|
2244 If optional argument FORCE is non-nil, access the mark value |
3487 | 2245 even if the mark is not currently active, and return nil |
2246 if there is no mark at all. | |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
2247 |
475 | 2248 If you are using this in an editing command, you are most likely making |
2249 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
|
2250 (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
|
2251 (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
|
2252 (signal 'mark-inactive nil))) |
475 | 2253 |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
2254 ;; 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
|
2255 ;; run deactivate-mark-hook. This shorthand should simplify. |
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
2256 (defsubst deactivate-mark () |
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
2257 "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
|
2258 \(That makes a difference only in Transient Mark mode.) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
2259 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
|
2260 (cond |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2261 ((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
|
2262 (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
|
2263 (transient-mark-mode |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2264 (setq mark-active nil) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2265 (run-hooks 'deactivate-mark-hook)))) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
2266 |
475 | 2267 (defun set-mark (pos) |
2268 "Set this buffer's mark to POS. Don't use this function! | |
2269 That is to say, don't use this function unless you want | |
2270 the user to see that the mark has moved, and you want the previous | |
2271 mark position to be lost. | |
2272 | |
2273 Normally, when a new mark is set, the old one should go on the stack. | |
2274 This is why most applications should use push-mark, not set-mark. | |
2275 | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
2276 Novice Emacs Lisp programmers often try to use the mark for the wrong |
475 | 2277 purposes. The mark saves a location for the user's convenience. |
2278 Most editing commands should not alter the mark. | |
2279 To remember a location for internal use in the Lisp program, | |
2280 store it in a Lisp variable. Example: | |
2281 | |
2282 (let ((beg (point))) (forward-line 1) (delete-region beg (point)))." | |
2283 | |
4287
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
2284 (if pos |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
2285 (progn |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
2286 (setq mark-active t) |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
2287 (run-hooks 'activate-mark-hook) |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
2288 (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
|
2289 ;; 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
|
2290 ;; 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
|
2291 ;; 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
|
2292 (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
|
2293 (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
|
2294 (set-marker (mark-marker) nil))) |
475 | 2295 |
2296 (defvar mark-ring nil | |
8695
0f702e9ab06d
(mark-ring): Add permanent-local prop. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8660
diff
changeset
|
2297 "The list of former marks of the current buffer, most recent first.") |
475 | 2298 (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
|
2299 (put 'mark-ring 'permanent-local t) |
475 | 2300 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2301 (defcustom mark-ring-max 16 |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2302 "*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
|
2303 :type 'integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2304 :group 'editing-basics) |
475 | 2305 |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2306 (defvar global-mark-ring nil |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2307 "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
|
2308 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2309 (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
|
2310 "*Maximum size of global mark ring. \ |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2311 Start discarding off end if gets this big." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2312 :type 'integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2313 :group 'editing-basics) |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2314 |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2315 (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
|
2316 "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
|
2317 \(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
|
2318 (interactive) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2319 (if (null (mark t)) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2320 (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
|
2321 (goto-char (mark t)) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2322 (pop-mark))) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2323 |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2324 (defun push-mark-command (arg) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2325 "Set mark at where point is. |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2326 If no prefix arg and mark is already set there, just activate it." |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2327 (interactive "P") |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2328 (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
|
2329 (if (or arg (null mark) (/= mark (point))) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2330 (push-mark nil nil t) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2331 (setq mark-active t) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2332 (message "Mark activated")))) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2333 |
475 | 2334 (defun set-mark-command (arg) |
2335 "Set mark at where point is, or jump to mark. | |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2336 With no prefix argument, set mark, push old mark position on local mark |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2337 ring, and push mark on global mark ring. Immediately repeating the |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2338 command activates `transient-mark-mode' temporarily. |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2339 |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2340 With argument, jump to mark, and pop a new position for mark off the ring |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2341 \(does not affect global mark ring\). Repeating the command without |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2342 an argument jumps to the next position off the mark ring. |
475 | 2343 |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
2344 Novice Emacs Lisp programmers often try to use the mark for the wrong |
475 | 2345 purposes. See the documentation of `set-mark' for more information." |
2346 (interactive "P") | |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2347 (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
|
2348 (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
|
2349 (cond |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2350 ((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
|
2351 (if arg |
92b336df72b8
(pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents:
44586
diff
changeset
|
2352 (pop-to-mark-command) |
92b336df72b8
(pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents:
44586
diff
changeset
|
2353 (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
|
2354 ((eq last-command 'pop-to-mark-command) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2355 (if (and (consp arg) (> (prefix-numeric-value arg) 4)) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2356 (push-mark-command nil) |
44664
92b336df72b8
(pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents:
44586
diff
changeset
|
2357 (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
|
2358 (pop-to-mark-command))) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2359 (arg |
44664
92b336df72b8
(pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents:
44586
diff
changeset
|
2360 (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
|
2361 (pop-to-mark-command)) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2362 ((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
|
2363 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
|
2364 (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
|
2365 (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
|
2366 (t |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2367 (push-mark-command nil)))) |
475 | 2368 |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
2369 (defun push-mark (&optional location nomsg activate) |
475 | 2370 "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
|
2371 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
|
2372 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
|
2373 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
|
2374 In Transient Mark mode, activate mark if optional third arg ACTIVATE non-nil. |
475 | 2375 |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
2376 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
|
2377 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
|
2378 |
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
2379 In Transient Mark mode, this does not activate the mark." |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
2380 (if (null (mark t)) |
475 | 2381 nil |
2382 (setq mark-ring (cons (copy-marker (mark-marker)) mark-ring)) | |
2383 (if (> (length mark-ring) mark-ring-max) | |
2384 (progn | |
2385 (move-marker (car (nthcdr mark-ring-max mark-ring)) nil) | |
2386 (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
|
2387 (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
|
2388 ;; 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
|
2389 (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
|
2390 (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
|
2391 ;; 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
|
2392 ;; 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
|
2393 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
|
2394 (setq global-mark-ring (cons (copy-marker (mark-marker)) global-mark-ring)) |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2395 (if (> (length global-mark-ring) global-mark-ring-max) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2396 (progn |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2397 (move-marker (car (nthcdr global-mark-ring-max global-mark-ring)) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2398 nil) |
5812
1959e5c4a563
(push-mark): Don't push on global-mark-ring if its car is a marker in the
Roland McGrath <roland@gnu.org>
parents:
5811
diff
changeset
|
2399 (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
|
2400 (or nomsg executing-kbd-macro (> (minibuffer-depth) 0) |
475 | 2401 (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
|
2402 (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
|
2403 (set-mark (mark t))) |
475 | 2404 nil) |
2405 | |
2406 (defun pop-mark () | |
2407 "Pop off mark ring into the buffer's actual mark. | |
2408 Does not set point. Does nothing if mark ring is empty." | |
2409 (if mark-ring | |
2410 (progn | |
2411 (setq mark-ring (nconc mark-ring (list (copy-marker (mark-marker))))) | |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
2412 (set-marker (mark-marker) (+ 0 (car mark-ring)) (current-buffer)) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
2413 (deactivate-mark) |
475 | 2414 (move-marker (car mark-ring) nil) |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
2415 (if (null (mark t)) (ding)) |
475 | 2416 (setq mark-ring (cdr mark-ring))))) |
2417 | |
16436
d2acc84badf4
Use defalias not define-function.
Richard M. Stallman <rms@gnu.org>
parents:
16417
diff
changeset
|
2418 (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
|
2419 (defun exchange-point-and-mark (&optional arg) |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
2420 "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
|
2421 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
|
2422 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
|
2423 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
|
2424 (interactive "P") |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2425 (if arg |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2426 (if mark-active |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2427 (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
|
2428 (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
|
2429 (setq arg nil))) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2430 (unless arg |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2431 (let ((omark (mark t))) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2432 (if (null omark) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2433 (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
|
2434 (set-mark (point)) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2435 (goto-char omark) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
2436 nil))) |
2796
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
2437 |
17514 | 2438 (defun transient-mark-mode (arg) |
2796
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
2439 "Toggle Transient Mark mode. |
2935
653e14f61220
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
2850
diff
changeset
|
2440 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
|
2441 |
5372
ac927443eae9
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5343
diff
changeset
|
2442 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
|
2443 Changing the buffer \"deactivates\" the mark. |
ac927443eae9
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5343
diff
changeset
|
2444 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
|
2445 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
|
2446 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
|
2447 |
37092
c365952bf534
(transient-mark-mode): Mention ESC ESC ESC in the doc string as well.
Eli Zaretskii <eliz@gnu.org>
parents:
37074
diff
changeset
|
2448 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
|
2449 \\[keyboard-escape-quit]. |
37074
43067b78ec71
(transient-mark-mode): Mention C-g in the doc string.
Eli Zaretskii <eliz@gnu.org>
parents:
36668
diff
changeset
|
2450 |
35631
bc0a3dbd22f6
(transient-mark-mode): Document the fact that many
Eli Zaretskii <eliz@gnu.org>
parents:
35589
diff
changeset
|
2451 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
|
2452 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
|
2453 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
|
2454 \\[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
|
2455 \\[query-replace], \\[query-replace-regexp], and \\[undo]. Invoke |
35635 | 2456 \\[apropos-documentation] and type \"transient\" or \"mark.*active\" at |
2457 the prompt, to see the documentation of commands which are sensitive to | |
2458 the Transient Mark mode." | |
17514 | 2459 (interactive "P") |
2796
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
2460 (setq transient-mark-mode |
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
2461 (if (null arg) |
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
2462 (not transient-mark-mode) |
17513
ea3acb6b992a
(transient-mark-mode): Print message if used interactively.
Richard M. Stallman <rms@gnu.org>
parents:
17471
diff
changeset
|
2463 (> (prefix-numeric-value arg) 0))) |
17514 | 2464 (if (interactive-p) |
2465 (if transient-mark-mode | |
2466 (message "Transient Mark mode enabled") | |
2467 (message "Transient Mark mode disabled")))) | |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2468 |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2469 (defun pop-global-mark () |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2470 "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
|
2471 (interactive) |
7881
4ab8723cd491
(pop-global-mark): Discard entries for nonexistent buffers.
Richard M. Stallman <rms@gnu.org>
parents:
7877
diff
changeset
|
2472 ;; 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
|
2473 (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
|
2474 (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
|
2475 (or global-mark-ring |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2476 (error "No global mark set")) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2477 (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
|
2478 (buffer (marker-buffer marker)) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2479 (position (marker-position marker))) |
10351
e34cbd5276bd
(pop-global-mark): Make pop-global-mark treat
Richard M. Stallman <rms@gnu.org>
parents:
10284
diff
changeset
|
2480 (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
|
2481 (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
|
2482 (set-buffer buffer) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2483 (or (and (>= position (point-min)) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2484 (<= position (point-max))) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2485 (widen)) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2486 (goto-char position) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
2487 (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
|
2488 |
34101
559c35839090
(next-line-add-newlines): Change default to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
34071
diff
changeset
|
2489 (defcustom next-line-add-newlines nil |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2490 "*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
|
2491 :type 'boolean |
35333
ac14700e2c6b
(next-line-add-newlines): Add :version.
Dave Love <fx@gnu.org>
parents:
35327
diff
changeset
|
2492 :version "21.1" |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2493 :group 'editing-basics) |
2568
15014ba142a7
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2446
diff
changeset
|
2494 |
42128 | 2495 (defun next-line (&optional arg) |
475 | 2496 "Move cursor vertically down ARG lines. |
2497 If there is no character in the target line exactly under the current column, | |
2498 the cursor is positioned after the character in that line which spans this | |
2499 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
|
2500 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
|
2501 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
|
2502 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
|
2503 cursor to the end of the buffer. |
475 | 2504 |
2505 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
|
2506 a semipermanent goal column for this command. |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
2507 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
|
2508 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
|
2509 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
|
2510 when there is no goal column. |
475 | 2511 |
2512 If you are thinking of using this in a Lisp program, consider | |
2513 using `forward-line' instead. It is usually easier to use | |
2514 and more reliable (no dependence on goal column, etc.)." | |
2515 (interactive "p") | |
42128 | 2516 (unless 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
|
2517 (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
|
2518 (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
|
2519 ;; 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
|
2520 (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
|
2521 (end-of-line) |
65f3042831db
(next-line): Goto end-of-line before inserting a newline.
Gerd Moellmann <gerd@gnu.org>
parents:
35776
diff
changeset
|
2522 (insert "\n")) |
35589
e334380bbb2c
(next-line): Don't let `newline' expand abbrevs.
Gerd Moellmann <gerd@gnu.org>
parents:
35346
diff
changeset
|
2523 (line-move arg)) |
10226
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
2524 (if (interactive-p) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
2525 (condition-case nil |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
2526 (line-move arg) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
2527 ((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
|
2528 (line-move arg))) |
475 | 2529 nil) |
2530 | |
42128 | 2531 (defun previous-line (&optional arg) |
475 | 2532 "Move cursor vertically up ARG lines. |
2533 If there is no character in the target line exactly over the current column, | |
2534 the cursor is positioned after the character in that line which spans this | |
2535 column, or at the end of the line if it is not long enough. | |
2536 | |
2537 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
|
2538 a semipermanent goal column for this command. |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
2539 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
|
2540 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
|
2541 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
|
2542 when there is no goal column. |
475 | 2543 |
2544 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
|
2545 `forward-line' with a negative argument instead. It is usually easier |
475 | 2546 to use and more reliable (no dependence on goal column, etc.)." |
2547 (interactive "p") | |
42128 | 2548 (unless 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
|
2549 (if (interactive-p) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
2550 (condition-case nil |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
2551 (line-move (- arg)) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
2552 ((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
|
2553 (line-move (- arg))) |
475 | 2554 nil) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
2555 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2556 (defcustom track-eol nil |
475 | 2557 "*Non-nil means vertical motion starting at end of line keeps to ends of lines. |
2558 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
|
2559 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
|
2560 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2561 :group 'editing-basics) |
475 | 2562 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2563 (defcustom goal-column nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2564 "*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
|
2565 :type '(choice integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2566 (const :tag "None" nil)) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2567 :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
|
2568 (make-variable-buffer-local 'goal-column) |
475 | 2569 |
2570 (defvar temporary-goal-column 0 | |
2571 "Current goal column for vertical motion. | |
2572 It is the column where point was | |
2573 at the start of current run of vertical motion commands. | |
513 | 2574 When the `track-eol' feature is doing its job, the value is 9999.") |
475 | 2575 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2576 (defcustom line-move-ignore-invisible nil |
10949
99c9f475a355
(line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10943
diff
changeset
|
2577 "*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
|
2578 Outline mode sets this." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2579 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2580 :group 'editing-basics) |
10949
99c9f475a355
(line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10943
diff
changeset
|
2581 |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2582 (defun line-move-invisible (pos) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2583 "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
|
2584 (let ((prop |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2585 (get-char-property pos 'invisible))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2586 (if (eq buffer-invisibility-spec t) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2587 prop |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2588 (or (memq prop buffer-invisibility-spec) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2589 (assq prop buffer-invisibility-spec))))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2590 |
11326
0d5ebc078c51
(line-move): Turn off intangibility for intermediate stops.
Richard M. Stallman <rms@gnu.org>
parents:
11324
diff
changeset
|
2591 ;; 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
|
2592 ;; Arg says how many lines to move. |
475 | 2593 (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
|
2594 ;; 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
|
2595 ;; for intermediate positions. |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
2596 (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
|
2597 (opoint (point)) |
19003
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2598 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
|
2599 (unwind-protect |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
2600 (progn |
44505
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2601 (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
|
2602 (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
|
2603 (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
|
2604 ;; 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
|
2605 ;; 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
|
2606 (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
|
2607 9999 |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
2608 (current-column)))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
2609 (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
|
2610 (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
|
2611 ;; 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
|
2612 ;; 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
|
2613 (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
|
2614 (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
|
2615 ;; 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
|
2616 ;; 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
|
2617 ;; 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
|
2618 (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
|
2619 (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
|
2620 (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
|
2621 (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
|
2622 (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
|
2623 (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
|
2624 (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
|
2625 '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
|
2626 '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
|
2627 nil)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
2628 ;; 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
|
2629 (while (> arg 0) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2630 ;; If the following character is currently invisible, |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2631 ;; 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
|
2632 (while (and (not (eobp)) (line-move-invisible (point))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2633 (goto-char (next-char-property-change (point)))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2634 ;; 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
|
2635 (end-of-line) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
2636 (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
|
2637 (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
|
2638 (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
|
2639 (while (< arg 0) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
2640 (beginning-of-line) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
2641 (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
|
2642 (signal 'beginning-of-buffer nil)) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2643 (setq arg (1+ arg)) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2644 (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
|
2645 (goto-char (previous-char-property-change (point))))))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2646 |
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
|
2647 (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
|
2648 ;; 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
|
2649 ;; 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
|
2650 (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
|
2651 ((< 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
|
2652 ;; 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
|
2653 ;; 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
|
2654 (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
|
2655 (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
|
2656 (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
|
2657 nil) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2658 |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2659 (defun line-move-finish (column opoint) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2660 (let ((repeat t)) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2661 (while repeat |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2662 ;; 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
|
2663 (setq repeat nil) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2664 |
44756
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
2665 (let (new |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2666 (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
|
2667 (line-end |
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
2668 ;; 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
|
2669 ;; ignoring effectively intangible newlines. |
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
2670 (let ((inhibit-point-motion-hooks nil)) |
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
2671 (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
|
2672 |
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
2673 ;; 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
|
2674 (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
|
2675 (setq new (point)) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2676 |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2677 ;; Process intangibility within a line. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2678 ;; Move to the chosen destination position from above, |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2679 ;; with intangibility processing enabled. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2680 |
19003
9d24caacda44
(line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents:
18902
diff
changeset
|
2681 (goto-char (point-min)) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2682 (let ((inhibit-point-motion-hooks nil)) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2683 (goto-char new) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2684 |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2685 ;; 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
|
2686 ;; 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
|
2687 (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
|
2688 (setq new (point)) |
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
2689 ;; 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
|
2690 ;; 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
|
2691 ;; 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
|
2692 (backward-char) |
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
2693 (if (<= (point) line-end) |
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
2694 (setq new (point)) |
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
2695 ;; 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
|
2696 (setq new line-end)))) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2697 |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2698 ;; Now move to the updated destination, processing fields |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2699 ;; as well as intangibility. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2700 (goto-char opoint) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2701 (let ((inhibit-point-motion-hooks nil)) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2702 (goto-char |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2703 (constrain-to-field new opoint nil t |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2704 'inhibit-line-move-field-capture))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2705 |
44756
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
2706 ;; 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
|
2707 ;; retry everything within that new line. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2708 (when (or (< (point) line-beg) (> (point) line-end)) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2709 ;; Repeat the intangibility and field processing. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2710 (setq repeat t)))))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2711 |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2712 (defun line-move-to-column (col) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2713 "Try to find column COL, considering invisibility. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2714 This function works only in certain cases, |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2715 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
|
2716 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
|
2717 (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
|
2718 (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
|
2719 (move-to-column col)) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2720 |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2721 (when (and line-move-ignore-invisible |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2722 (not (bolp)) (line-move-invisible (1- (point)))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2723 (let ((normal-location (point)) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2724 (normal-column (current-column))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2725 ;; If the following character is currently invisible, |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2726 ;; 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
|
2727 (while (and (not (eobp)) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2728 (line-move-invisible (point))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2729 (goto-char (next-char-property-change (point)))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2730 ;; Have we advanced to a larger column position? |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2731 (if (> (current-column) normal-column) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2732 ;; 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
|
2733 ;; See if we can make any further progress. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2734 (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
|
2735 ;; Otherwise, go to the place we originally found |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2736 ;; and move back over invisible text. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2737 ;; 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
|
2738 ;; but with a more reasonable buffer position. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2739 (goto-char normal-location) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
2740 (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
|
2741 (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
|
2742 (goto-char (previous-char-property-change (point) line-beg)))))))) |
475 | 2743 |
1771
3f0f18d4eb8c
* simple.el (set-goal-column): Make this command disabled by default.
Jim Blandy <jimb@redhat.com>
parents:
1760
diff
changeset
|
2744 ;;; 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
|
2745 ;;; 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
|
2746 (put 'set-goal-column 'disabled t) |
475 | 2747 |
2748 (defun set-goal-column (arg) | |
2749 "Set the current horizontal position as a goal for \\[next-line] and \\[previous-line]. | |
2750 Those commands will move to this position in the line moved to | |
2751 rather than trying to keep the same horizontal position. | |
2752 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
|
2753 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
|
2754 The goal column is stored in the variable `goal-column'." |
475 | 2755 (interactive "P") |
2756 (if arg | |
2757 (progn | |
2758 (setq goal-column nil) | |
2759 (message "No goal column")) | |
2760 (setq goal-column (current-column)) | |
2761 (message (substitute-command-keys | |
2762 "Goal column %d (use \\[set-goal-column] with an arg to unset it)") | |
2763 goal-column)) | |
2764 nil) | |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
2765 |
8006
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
2766 |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
2767 (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
|
2768 "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
|
2769 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
|
2770 (interactive "P") |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
2771 (scroll-other-window |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
2772 ;; Just invert the argument's meaning. |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
2773 ;; 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
|
2774 (if (eq lines '-) nil |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
2775 (if (null lines) '- |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
2776 (- (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
|
2777 (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
|
2778 |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2779 (defun beginning-of-buffer-other-window (arg) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2780 "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
|
2781 Leave mark at previous position. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2782 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
|
2783 (interactive "P") |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2784 (let ((orig-window (selected-window)) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2785 (window (other-window-for-scrolling))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2786 ;; 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
|
2787 ;; 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
|
2788 (unwind-protect |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2789 (progn |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2790 (select-window window) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2791 ;; 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
|
2792 (beginning-of-buffer arg) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2793 ;; Set point accordingly. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2794 (recenter '(t))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2795 (select-window orig-window)))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2796 |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2797 (defun end-of-buffer-other-window (arg) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2798 "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
|
2799 Leave mark at previous position. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2800 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
|
2801 (interactive "P") |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2802 ;; See beginning-of-buffer-other-window for comments. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2803 (let ((orig-window (selected-window)) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2804 (window (other-window-for-scrolling))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2805 (unwind-protect |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2806 (progn |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2807 (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
|
2808 (end-of-buffer arg) |
8057
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2809 (recenter '(t))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
2810 (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
|
2811 |
475 | 2812 (defun transpose-chars (arg) |
2813 "Interchange characters around point, moving forward one character. | |
2814 With prefix arg ARG, effect is to take character before point | |
2815 and drag it forward past ARG other characters (backward if ARG negative). | |
2816 If no argument and at end of line, the previous two chars are exchanged." | |
2817 (interactive "*P") | |
2818 (and (null arg) (eolp) (forward-char -1)) | |
2819 (transpose-subr 'forward-char (prefix-numeric-value arg))) | |
2820 | |
2821 (defun transpose-words (arg) | |
2822 "Interchange words around point, leaving point at end of them. | |
2823 With prefix arg ARG, effect is to take word before or around point | |
2824 and drag it forward past ARG other words (backward if ARG negative). | |
2825 If ARG is zero, the words around or after point and around or after mark | |
2826 are interchanged." | |
44505
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2827 ;; FIXME: `foo a!nd bar' should transpose into `bar and foo'. |
475 | 2828 (interactive "*p") |
2829 (transpose-subr 'forward-word arg)) | |
2830 | |
2831 (defun transpose-sexps (arg) | |
2832 "Like \\[transpose-words] but applies to sexps. | |
2833 Does not work on a sexp that point is in the middle of | |
2834 if it is a list or string." | |
2835 (interactive "*p") | |
44505
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2836 (transpose-subr |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2837 (lambda (arg) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2838 ;; 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
|
2839 ;; (cons (progn (forward-sexp x) (point)) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2840 ;; (progn (forward-sexp (- x)) (point))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2841 ;; 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
|
2842 ;; 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
|
2843 ;; 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
|
2844 (if (if (> arg 0) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2845 (looking-at "\\sw\\|\\s_") |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2846 (and (not (bobp)) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2847 (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
|
2848 ;; 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
|
2849 (progn (funcall (if (> arg 0) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2850 'skip-syntax-backward 'skip-syntax-forward) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2851 "w_") |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2852 (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
|
2853 ;; 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
|
2854 ;; 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
|
2855 ;; we're going. |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2856 (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
|
2857 (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
|
2858 (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
|
2859 (not (zerop (funcall (if (> arg 0) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2860 'skip-syntax-forward |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2861 'skip-syntax-backward) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2862 "."))))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2863 (point))))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
2864 arg 'special)) |
475 | 2865 |
2866 (defun transpose-lines (arg) | |
2867 "Exchange current line and previous line, leaving point after both. | |
2868 With argument ARG, takes previous line and moves it past ARG lines. | |
2869 With argument 0, interchanges line point is in with line mark is in." | |
2870 (interactive "*p") | |
2871 (transpose-subr (function | |
2872 (lambda (arg) | |
20465
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
2873 (if (> arg 0) |
475 | 2874 (progn |
20465
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
2875 ;; Move forward over ARG lines, |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
2876 ;; but create newlines if necessary. |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
2877 (setq arg (forward-line arg)) |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
2878 (if (/= (preceding-char) ?\n) |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
2879 (setq arg (1+ arg))) |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
2880 (if (> arg 0) |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
2881 (newline arg))) |
475 | 2882 (forward-line arg)))) |
2883 arg)) | |
2884 | |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2885 (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
|
2886 (let ((aux (if special mover |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2887 (lambda (x) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2888 (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
|
2889 (progn (funcall mover (- x)) (point)))))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2890 pos1 pos2) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2891 (cond |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2892 ((= arg 0) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2893 (save-excursion |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2894 (setq pos1 (funcall aux 1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2895 (goto-char (mark)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2896 (setq pos2 (funcall aux 1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2897 (transpose-subr-1 pos1 pos2)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2898 (exchange-point-and-mark)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2899 ((> arg 0) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2900 (setq pos1 (funcall aux -1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2901 (setq pos2 (funcall aux arg)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2902 (transpose-subr-1 pos1 pos2) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2903 (goto-char (car pos2))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2904 (t |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2905 (setq pos1 (funcall aux -1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2906 (goto-char (car pos1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2907 (setq pos2 (funcall aux arg)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2908 (transpose-subr-1 pos1 pos2))))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2909 |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2910 (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
|
2911 (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
|
2912 (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
|
2913 (when (> (car pos1) (car pos2)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2914 (let ((swap pos1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2915 (setq pos1 pos2 pos2 swap))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2916 (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
|
2917 (atomic-change-group |
49ff3106980b
(undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
43032
diff
changeset
|
2918 (let (word2) |
49ff3106980b
(undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
43032
diff
changeset
|
2919 (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
|
2920 (goto-char (car pos2)) |
49ff3106980b
(undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
43032
diff
changeset
|
2921 (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
|
2922 (goto-char (car pos1)) |
49ff3106980b
(undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
43032
diff
changeset
|
2923 (insert word2)))) |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
2924 |
475 | 2925 (defun backward-word (arg) |
39110 | 2926 "Move backward until encountering the beginning of a word. |
32222 | 2927 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
|
2928 (interactive "p") |
475 | 2929 (forward-word (- arg))) |
2930 | |
2931 (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
|
2932 "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
|
2933 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
|
2934 already marked." |
475 | 2935 (interactive "p") |
43301
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
2936 (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
|
2937 (set-mark |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
2938 (save-excursion |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
2939 (goto-char (mark)) |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
2940 (forward-word arg) |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
2941 (point)))) |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
2942 (t |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
2943 (push-mark |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
2944 (save-excursion |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
2945 (forward-word arg) |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
2946 (point)) |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
2947 nil t)))) |
475 | 2948 |
2949 (defun kill-word (arg) | |
2950 "Kill characters forward until encountering the end of a word. | |
2951 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
|
2952 (interactive "p") |
25400
c75839c09c84
(kill-word): Undo previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25342
diff
changeset
|
2953 (kill-region (point) (progn (forward-word arg) (point)))) |
475 | 2954 |
2955 (defun backward-kill-word (arg) | |
2956 "Kill characters backward until encountering the end of a word. | |
2957 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
|
2958 (interactive "p") |
475 | 2959 (kill-word (- arg))) |
2416
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2960 |
6174
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2961 (defun current-word (&optional strict) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2962 "Return the word point is on (or a nearby word) as a string. |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2963 If optional arg STRICT is non-nil, return nil unless point is within |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2964 or adjacent to a word." |
2416
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2965 (save-excursion |
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2966 (let ((oldpoint (point)) (start (point)) (end (point))) |
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2967 (skip-syntax-backward "w_") (setq start (point)) |
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2968 (goto-char oldpoint) |
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2969 (skip-syntax-forward "w_") (setq end (point)) |
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
2970 (if (and (eq start oldpoint) (eq end oldpoint)) |
6174
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2971 ;; Point is neither within nor adjacent to a word. |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2972 (and (not strict) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2973 (progn |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2974 ;; Look for preceding word in same line. |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2975 (skip-syntax-backward "^w_" |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2976 (save-excursion (beginning-of-line) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2977 (point))) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2978 (if (bolp) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2979 ;; No preceding word in same line. |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2980 ;; Look for following word in same line. |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2981 (progn |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2982 (skip-syntax-forward "^w_" |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2983 (save-excursion (end-of-line) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2984 (point))) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2985 (setq start (point)) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2986 (skip-syntax-forward "w_") |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2987 (setq end (point))) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2988 (setq end (point)) |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2989 (skip-syntax-backward "w_") |
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
2990 (setq start (point))) |
18379
1dd6f63f0ea3
(paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18334
diff
changeset
|
2991 (buffer-substring-no-properties start end))) |
1dd6f63f0ea3
(paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18334
diff
changeset
|
2992 (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
|
2993 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2994 (defcustom fill-prefix nil |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2995 "*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
|
2996 :type '(choice (const :tag "None" nil) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2997 string) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2998 :group 'fill) |
475 | 2999 (make-variable-buffer-local 'fill-prefix) |
3000 | |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3001 (defcustom auto-fill-inhibit-regexp nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3002 "*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
|
3003 :type '(choice (const :tag "None" nil) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3004 regexp) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3005 :group 'fill) |
475 | 3006 |
33781
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
3007 (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
|
3008 "*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
|
3009 |
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
3010 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
|
3011 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
|
3012 indicating whether it should use soft newlines. |
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
3013 |
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
3014 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
|
3015 |
21122
912cc3491589
(do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents:
21074
diff
changeset
|
3016 ;; 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
|
3017 ;; 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
|
3018 ;; 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
|
3019 ;; (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
|
3020 ;; but this one is the default one.) |
475 | 3021 (defun do-auto-fill () |
12708
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
3022 (let (fc justify bol give-up |
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
3023 (fill-prefix fill-prefix)) |
10471
3eb77f03f53e
(do-auto-fill): justification renamed to current-justification.
Richard M. Stallman <rms@gnu.org>
parents:
10469
diff
changeset
|
3024 (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
|
3025 (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
|
3026 (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
|
3027 (<= (current-column) fc)) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
3028 (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
|
3029 (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
|
3030 (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
|
3031 (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
|
3032 nil ;; Auto-filling not required |
10813
bccf0295c66e
(open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents:
10805
diff
changeset
|
3033 (if (memq justify '(full center right)) |
bccf0295c66e
(open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents:
10805
diff
changeset
|
3034 (save-excursion (unjustify-current-line))) |
12708
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
3035 |
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
3036 ;; 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
|
3037 (when (and adaptive-fill-mode |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3038 (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
|
3039 (let ((prefix |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3040 (fill-context-prefix |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3041 (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
|
3042 (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
|
3043 (and prefix (not (equal prefix "")) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3044 ;; Use auto-indentation rather than a guessed empty prefix. |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3045 (not (and fill-indent-according-to-mode |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3046 (string-match "[ \t]*" prefix))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3047 (setq fill-prefix prefix)))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3048 |
10469
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
3049 (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
|
3050 ;; 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
|
3051 (let* (after-prefix |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
3052 (fill-point |
44505
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3053 (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
|
3054 (save-excursion |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
3055 (beginning-of-line) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
3056 (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
|
3057 (and fill-prefix |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
3058 (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
|
3059 (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
|
3060 (move-to-column (1+ fc)) |
44505
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3061 (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
|
3062 (point))))) |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
3063 |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
3064 ;; 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
|
3065 (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
|
3066 (goto-char fill-point) |
44505
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3067 (or (bolp) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3068 ;; 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
|
3069 (save-excursion (skip-chars-forward " ") (eolp)) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3070 ;; 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
|
3071 ;; 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
|
3072 (and after-prefix (<= (point) after-prefix)) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3073 ;; 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
|
3074 ;; 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
|
3075 (and comment-start-skip |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3076 (let ((limit (point))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3077 (beginning-of-line) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3078 (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
|
3079 limit t) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3080 (eq (point) limit)))))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3081 ;; 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
|
3082 (setq give-up t) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3083 ;; 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
|
3084 (let ((prev-column (current-column))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3085 ;; 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
|
3086 ;; 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
|
3087 ;; 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
|
3088 (if (save-excursion |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3089 (skip-chars-backward " \t") |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3090 (= (point) fill-point)) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3091 (funcall comment-line-break-function t) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3092 (save-excursion |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3093 (goto-char fill-point) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3094 (funcall comment-line-break-function t))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3095 ;; Now do justification, if required |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3096 (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
|
3097 (save-excursion |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3098 (end-of-line 0) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3099 (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
|
3100 ;; 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
|
3101 ;; 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
|
3102 ;; trying again will not help. |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3103 (if (>= (current-column) prev-column) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3104 (setq give-up t)))))) |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
3105 ;; Justify last line. |
15263
0d7899c372ed
(do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents:
15115
diff
changeset
|
3106 (justify-current-line justify t t) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
3107 t))) |
475 | 3108 |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
3109 (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
|
3110 "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
|
3111 Some major modes set this.") |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
3112 |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
3113 (defun auto-fill-mode (&optional arg) |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
3114 "Toggle Auto Fill mode. |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
3115 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
|
3116 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
|
3117 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
|
3118 |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
3119 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
|
3120 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
|
3121 (interactive "P") |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
3122 (prog1 (setq auto-fill-function |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
3123 (if (if (null arg) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
3124 (not auto-fill-function) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
3125 (> (prefix-numeric-value arg) 0)) |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
3126 normal-auto-fill-function |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
3127 nil)) |
11572
09d49f6e0af9
(auto-fill-mode): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents:
11479
diff
changeset
|
3128 (force-mode-line-update))) |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
3129 |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
3130 ;; 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
|
3131 (defun auto-fill-function () |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
3132 "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
|
3133 nil) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
3134 |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
3135 (defun turn-on-auto-fill () |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
3136 "Unconditionally turn on Auto Fill mode." |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
3137 (auto-fill-mode 1)) |
29808
fa2c8534a53a
(turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29345
diff
changeset
|
3138 |
fa2c8534a53a
(turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29345
diff
changeset
|
3139 (defun turn-off-auto-fill () |
fa2c8534a53a
(turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29345
diff
changeset
|
3140 "Unconditionally turn off Auto Fill mode." |
fa2c8534a53a
(turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29345
diff
changeset
|
3141 (auto-fill-mode -1)) |
fa2c8534a53a
(turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29345
diff
changeset
|
3142 |
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
|
3143 (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
|
3144 |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
3145 (defun set-fill-column (arg) |
15431
68cca71d69bd
(set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents:
15305
diff
changeset
|
3146 "Set `fill-column' to specified argument. |
23447
7ccd43d053fd
(set-fill-column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23251
diff
changeset
|
3147 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
|
3148 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
|
3149 (interactive "P") |
17874
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
3150 (if (consp arg) |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
3151 (setq arg (current-column))) |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
3152 (if (not (integerp arg)) |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
3153 ;; Disallow missing argument; it's probably a typo for C-x C-f. |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
3154 (error "set-fill-column requires an explicit argument") |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
3155 (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
|
3156 (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
|
3157 |
475 | 3158 (defun set-selective-display (arg) |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
3159 "Set `selective-display' to ARG; clear it if no arg. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
3160 When the value of `selective-display' is a number > 0, |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
3161 lines whose indentation is >= that value are not displayed. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
3162 The variable `selective-display' has a separate value for each buffer." |
475 | 3163 (interactive "P") |
3164 (if (eq selective-display t) | |
3165 (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
|
3166 (let ((current-vpos |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
3167 (save-restriction |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
3168 (narrow-to-region (point-min) (point)) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
3169 (goto-char (window-start)) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
3170 (vertical-motion (window-height))))) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
3171 (setq selective-display |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
3172 (and arg (prefix-numeric-value arg))) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
3173 (recenter current-vpos)) |
475 | 3174 (set-window-start (selected-window) (window-start (selected-window))) |
3175 (princ "selective-display set to " t) | |
3176 (prin1 selective-display t) | |
3177 (princ "." t)) | |
3178 | |
17471
f383bfae3202
(overwrite-mode-binary, overwrite-mode-textual): Use defvar.
Richard M. Stallman <rms@gnu.org>
parents:
17355
diff
changeset
|
3179 (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
|
3180 "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
|
3181 (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
|
3182 "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
|
3183 |
475 | 3184 (defun overwrite-mode (arg) |
3185 "Toggle overwrite mode. | |
3186 With arg, turn overwrite mode on iff arg is positive. | |
3187 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
|
3188 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
|
3189 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
|
3190 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
|
3191 \\[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
|
3192 is supposed to make it easier to insert characters when necessary." |
475 | 3193 (interactive "P") |
3194 (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
|
3195 (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
|
3196 (> (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
|
3197 '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
|
3198 (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
|
3199 |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
3200 (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
|
3201 "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
|
3202 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
|
3203 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
|
3204 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
|
3205 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
|
3206 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
|
3207 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
|
3208 \\[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
|
3209 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
|
3210 |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
3211 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
|
3212 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
|
3213 `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
|
3214 (interactive "P") |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
3215 (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
|
3216 (if (if (null arg) |
2301
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
3217 (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
|
3218 (> (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
|
3219 '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
|
3220 (force-mode-line-update)) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
3221 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3222 (defcustom line-number-mode t |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3223 "*Non-nil means display line number in mode line." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3224 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3225 :group 'editing-basics) |
2301
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
3226 |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
3227 (defun line-number-mode (arg) |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
3228 "Toggle Line Number mode. |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
3229 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
|
3230 When Line Number mode is enabled, the line number appears |
23660 | 3231 in the mode line. |
3232 | |
38908
f917490db0d6
(line-number-mode): Mention the variable line-number-display-limit-width
Eli Zaretskii <eliz@gnu.org>
parents:
38847
diff
changeset
|
3233 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
|
3234 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
|
3235 and `line-number-display-limit-width'." |
2301
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
3236 (interactive "P") |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
3237 (setq line-number-mode |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
3238 (if (null arg) (not line-number-mode) |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
3239 (> (prefix-numeric-value arg) 0))) |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
3240 (force-mode-line-update)) |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
3241 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3242 (defcustom column-number-mode nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3243 "*Non-nil means display column number in mode line." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3244 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3245 :group 'editing-basics) |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
3246 |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
3247 (defun column-number-mode (arg) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
3248 "Toggle Column Number mode. |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
3249 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
|
3250 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
|
3251 in the mode line." |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
3252 (interactive "P") |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
3253 (setq column-number-mode |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
3254 (if (null arg) (not column-number-mode) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
3255 (> (prefix-numeric-value arg) 0))) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
3256 (force-mode-line-update)) |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
3257 |
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
|
3258 (defgroup paren-blinking nil |
18379
1dd6f63f0ea3
(paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18334
diff
changeset
|
3259 "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
|
3260 :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
|
3261 :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
|
3262 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3263 (defcustom blink-matching-paren t |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3264 "*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
|
3265 :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
|
3266 :group 'paren-blinking) |
475 | 3267 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3268 (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
|
3269 "*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
|
3270 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
|
3271 when it is off screen)." |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3272 :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
|
3273 :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
|
3274 |
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
3275 (defcustom blink-matching-paren-distance (* 25 1024) |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3276 "*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
|
3277 :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
|
3278 :group 'paren-blinking) |
475 | 3279 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3280 (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
|
3281 "*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
|
3282 :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
|
3283 :group 'paren-blinking) |
9771
3a51735d4a55
(blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9750
diff
changeset
|
3284 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3285 (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
|
3286 "*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
|
3287 :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
|
3288 :group 'paren-blinking) |
12893
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3289 |
475 | 3290 (defun blink-matching-open () |
3291 "Move cursor momentarily to the beginning of the sexp before point." | |
3292 (interactive) | |
3293 (and (> (point) (1+ (point-min))) | |
3294 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
|
3295 ;; 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
|
3296 (= 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
|
3297 (save-excursion |
b2157de450ca
(blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents:
9629
diff
changeset
|
3298 (forward-char -1) |
b2157de450ca
(blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents:
9629
diff
changeset
|
3299 (skip-syntax-backward "/\\") |
b2157de450ca
(blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents:
9629
diff
changeset
|
3300 (point))))) |
475 | 3301 (let* ((oldpos (point)) |
3302 (blinkpos) | |
3303 (mismatch)) | |
3304 (save-excursion | |
3305 (save-restriction | |
3306 (if blink-matching-paren-distance | |
3307 (narrow-to-region (max (point-min) | |
3308 (- (point) blink-matching-paren-distance)) | |
3309 oldpos)) | |
3310 (condition-case () | |
12893
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3311 (let ((parse-sexp-ignore-comments |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3312 (and parse-sexp-ignore-comments |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3313 (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
|
3314 (setq blinkpos (scan-sexps oldpos -1))) |
475 | 3315 (error nil))) |
12893
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3316 (and blinkpos |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3317 (/= (char-syntax (char-after blinkpos)) |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3318 ?\$) |
475 | 3319 (setq mismatch |
12893
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3320 (or (null (matching-paren (char-after blinkpos))) |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3321 (/= (char-after (1- oldpos)) |
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
3322 (matching-paren (char-after blinkpos)))))) |
475 | 3323 (if mismatch (setq blinkpos nil)) |
3324 (if blinkpos | |
23251
f19f44b54f00
(blink-matching-open): Don't log paren matching
Karl Heuer <kwzh@gnu.org>
parents:
22877
diff
changeset
|
3325 ;; 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
|
3326 (let (message-log-max) |
475 | 3327 (goto-char blinkpos) |
3328 (if (pos-visible-in-window-p) | |
13810
64679d67fde9
(blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
13587
diff
changeset
|
3329 (and blink-matching-paren-on-screen |
64679d67fde9
(blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
13587
diff
changeset
|
3330 (sit-for blink-matching-delay)) |
475 | 3331 (goto-char blinkpos) |
3332 (message | |
3333 "Matches %s" | |
6539
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
3334 ;; Show what precedes the open in its line, if anything. |
475 | 3335 (if (save-excursion |
3336 (skip-chars-backward " \t") | |
3337 (not (bolp))) | |
3338 (buffer-substring (progn (beginning-of-line) (point)) | |
3339 (1+ blinkpos)) | |
6539
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
3340 ;; 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
|
3341 (if (save-excursion |
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
3342 (forward-char 1) |
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
3343 (skip-chars-forward " \t") |
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
3344 (not (eolp))) |
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
3345 (buffer-substring blinkpos |
b705afc2b2ec
(blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents:
6386
diff
changeset
|
3346 (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
|
3347 ;; 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
|
3348 ;; if there is one. |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3349 (if (save-excursion |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3350 (skip-chars-backward "\n \t") |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3351 (not (bobp))) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3352 (concat |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3353 (buffer-substring (progn |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3354 (skip-chars-backward "\n \t") |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3355 (beginning-of-line) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3356 (point)) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3357 (progn (end-of-line) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3358 (skip-chars-backward " \t") |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3359 (point))) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3360 ;; 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
|
3361 "..." |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3362 (buffer-substring blinkpos (1+ blinkpos))) |
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
3363 ;; 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
|
3364 (buffer-substring blinkpos (1+ blinkpos)))))))) |
475 | 3365 (cond (mismatch |
3366 (message "Mismatched parentheses")) | |
3367 ((not blink-matching-paren-distance) | |
3368 (message "Unmatched parenthesis")))))))) | |
3369 | |
3370 ;Turned off because it makes dbx bomb out. | |
3371 (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
|
3372 |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
3373 ;; 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
|
3374 ;; 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
|
3375 ;; that happens in the QUIT macro at the C code level. |
475 | 3376 (defun keyboard-quit () |
22304 | 3377 "Signal a `quit' condition. |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
3378 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
|
3379 At top-level, as an editor command, this simply beeps." |
475 | 3380 (interactive) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
3381 (deactivate-mark) |
475 | 3382 (signal 'quit nil)) |
3383 | |
3384 (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
|
3385 |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3386 (defvar buffer-quit-function nil |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3387 "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
|
3388 \\[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
|
3389 \(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
|
3390 |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3391 (defun keyboard-escape-quit () |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3392 "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
|
3393 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
|
3394 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
|
3395 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
|
3396 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
|
3397 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
|
3398 (interactive) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3399 (cond ((eq last-command 'mode-exited) nil) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3400 ((> (minibuffer-depth) 0) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3401 (abort-recursive-edit)) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3402 (current-prefix-arg |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3403 nil) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3404 ((and transient-mark-mode |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3405 mark-active) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3406 (deactivate-mark)) |
17355
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
3407 ((> (recursion-depth) 0) |
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
3408 (exit-recursive-edit)) |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3409 (buffer-quit-function |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3410 (funcall buffer-quit-function)) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3411 ((not (one-window-p t)) |
17355
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
3412 (delete-other-windows)) |
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
3413 ((string-match "^ \\*" (buffer-name (current-buffer))) |
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
3414 (bury-buffer)))) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
3415 |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
3416 (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
|
3417 "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
|
3418 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
|
3419 specification for `play-sound'." |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
3420 (interactive "fPlay sound file: ") |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
3421 (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
|
3422 (if volume |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
3423 (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
|
3424 (if device |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
3425 (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
|
3426 (push 'sound sound) |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
3427 (play-sound sound))) |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
3428 |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3429 (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
|
3430 |
27234
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
3431 (defcustom read-mail-command 'rmail |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
3432 "*Your preference for a mail reading package. |
31573 | 3433 This is used by some keybindings which support reading mail. |
3434 See also `mail-user-agent' concerning sending mail." | |
27234
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
3435 :type '(choice (function-item rmail) |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
3436 (function-item gnus) |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
3437 (function-item mh-rmail) |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
3438 (function :tag "Other")) |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
3439 :version "21.1" |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
3440 :group 'mail) |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
3441 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3442 (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
|
3443 "*Your preference for a mail composition package. |
31573 | 3444 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
|
3445 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
|
3446 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
|
3447 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3448 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
|
3449 |
31573 | 3450 `sendmail-user-agent' -- use the default Emacs Mail package. |
3451 See Info node `(emacs)Sending Mail'. | |
3452 `mh-e-user-agent' -- use the Emacs interface to the MH mail system. | |
3453 See Info node `(mh-e)'. | |
3454 `message-user-agent' -- use the Gnus Message package. | |
3455 See Info node `(message)'. | |
3456 `gnus-user-agent' -- like `message-user-agent', but with Gnus | |
3457 paraphernalia, particularly the Gcc: header for | |
3458 archiving. | |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3459 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3460 Additional valid symbols may be available; check with the author of |
34687 | 3461 your package for details. The function should return non-nil if it |
3462 succeeds. | |
31573 | 3463 |
3464 See also `read-mail-command' concerning reading mail." | |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3465 :type '(radio (function-item :tag "Default Emacs mail" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3466 :format "%t\n" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3467 sendmail-user-agent) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3468 (function-item :tag "Emacs interface to MH" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3469 :format "%t\n" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3470 mh-e-user-agent) |
31573 | 3471 (function-item :tag "Gnus Message package" |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3472 :format "%t\n" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3473 message-user-agent) |
31573 | 3474 (function-item :tag "Gnus Message with full Gnus features" |
3475 :format "%t\n" | |
3476 gnus-user-agent) | |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3477 (function :tag "Other")) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3478 :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
|
3479 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3480 (defun define-mail-user-agent (symbol composefunc sendfunc |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3481 &optional abortfunc hookvar) |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3482 "Define a symbol to identify a mail-sending package for `mail-user-agent'. |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3483 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3484 SYMBOL can be any Lisp symbol. Its function definition and/or |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3485 value as a variable do not matter for this usage; we use only certain |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3486 properties on its property list, to encode the rest of the arguments. |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3487 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3488 COMPOSEFUNC is program callable function that composes an outgoing |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3489 mail message buffer. This function should set up the basics of the |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3490 buffer without requiring user interaction. It should populate the |
16624
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3491 standard mail headers, leaving the `to:' and `subject:' headers blank |
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3492 by default. |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3493 |
16632
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3494 COMPOSEFUNC should accept several optional arguments--the same |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3495 arguments that `compose-mail' takes. See that function's documentation. |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3496 |
16624
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3497 SENDFUNC is the command a user would run to send the message. |
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3498 |
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3499 Optional ABORTFUNC is the command a user would run to abort the |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3500 message. For mail packages that don't have a separate abort function, |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3501 this can be `kill-buffer' (the equivalent of omitting this argument). |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3502 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3503 Optional HOOKVAR is a hook variable that gets run before the message |
16624
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3504 is actually sent. Callers that use the `mail-user-agent' may |
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3505 install a hook function temporarily on this hook variable. |
cd1a0e1e6975
(sendmail-user-agent): Support 2 optional args.
Richard M. Stallman <rms@gnu.org>
parents:
16508
diff
changeset
|
3506 If HOOKVAR is nil, `mail-send-hook' is used. |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3507 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3508 The properties used on SYMBOL are `composefunc', `sendfunc', |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3509 `abortfunc', and `hookvar'." |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3510 (put symbol 'composefunc composefunc) |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3511 (put symbol 'sendfunc sendfunc) |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3512 (put symbol 'abortfunc (or abortfunc 'kill-buffer)) |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3513 (put symbol 'hookvar (or hookvar 'mail-send-hook))) |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3514 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3515 (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
|
3516 '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
|
3517 '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
|
3518 |
21906
2ee50035ee1b
(rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents:
21847
diff
changeset
|
3519 (defun rfc822-goto-eoh () |
2ee50035ee1b
(rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents:
21847
diff
changeset
|
3520 ;; 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
|
3521 (goto-char (point-min)) |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3522 (when (re-search-forward |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3523 "^\\([:\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
|
3524 (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
|
3525 |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3526 (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
|
3527 switch-function yank-action |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3528 send-actions) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3529 (if switch-function |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3530 (let ((special-display-buffer-names nil) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3531 (special-display-regexps nil) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3532 (same-window-buffer-names nil) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3533 (same-window-regexps nil)) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3534 (funcall switch-function "*mail*"))) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3535 (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
|
3536 (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
|
3537 (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
|
3538 (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
|
3539 continue |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3540 (error "Message aborted")) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3541 (save-excursion |
21906
2ee50035ee1b
(rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents:
21847
diff
changeset
|
3542 (rfc822-goto-eoh) |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3543 (while other-headers |
28491
3e21859cd0e7
(sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents:
28193
diff
changeset
|
3544 (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
|
3545 '("in-reply-to" "cc" "body")) |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3546 (insert (car (car other-headers)) ": " |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3547 (cdr (car other-headers)) "\n")) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3548 (setq other-headers (cdr other-headers))) |
28491
3e21859cd0e7
(sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents:
28193
diff
changeset
|
3549 (when body |
3e21859cd0e7
(sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents:
28193
diff
changeset
|
3550 (forward-line 1) |
3e21859cd0e7
(sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents:
28193
diff
changeset
|
3551 (insert body)) |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3552 t))) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
3553 |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
3554 (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
|
3555 '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
|
3556 'mh-before-send-letter-hook) |
16632
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3557 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3558 (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
|
3559 switch-function yank-action send-actions) |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3560 "Start composing a mail message to send. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3561 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
|
3562 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
|
3563 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
|
3564 and the initial Subject field, respectively. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3565 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3566 OTHER-HEADERS is an alist specifying additional |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3567 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
|
3568 HEADER and VALUE are strings. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3569 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3570 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
|
3571 being composed. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3572 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3573 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
|
3574 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
|
3575 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3576 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
|
3577 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
|
3578 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
|
3579 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
|
3580 \(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
|
3581 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
|
3582 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3583 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
|
3584 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
|
3585 (interactive |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3586 (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
|
3587 (let ((function (get mail-user-agent 'composefunc))) |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3588 (funcall function to subject other-headers continue |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
3589 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
|
3590 |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3591 (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
|
3592 yank-action send-actions) |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3593 "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
|
3594 (interactive |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3595 (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
|
3596 (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
|
3597 '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
|
3598 |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3599 |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3600 (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
|
3601 yank-action send-actions) |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3602 "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
|
3603 (interactive |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
3604 (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
|
3605 (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
|
3606 '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
|
3607 |
17606
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3608 (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
|
3609 "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
|
3610 |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3611 (defun set-variable (var val) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3612 "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
|
3613 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
|
3614 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
|
3615 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
|
3616 |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3617 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
|
3618 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
|
3619 |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3620 If VARIABLE has been defined with `defcustom', then the type information |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3621 in the definition is used to check that VALUE is valid." |
22157
7c92848a9d80
(set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents:
22144
diff
changeset
|
3622 (interactive |
7c92848a9d80
(set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents:
22144
diff
changeset
|
3623 (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
|
3624 (var (if (symbolp default-var) |
7c92848a9d80
(set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents:
22144
diff
changeset
|
3625 (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
|
3626 default-var) |
7c92848a9d80
(set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents:
22144
diff
changeset
|
3627 (read-variable "Set variable: "))) |
17606
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3628 (minibuffer-help-form '(describe-variable var)) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3629 (prop (get var 'variable-interactive)) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3630 (prompt (format "Set %s to value: " var)) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3631 (val (if prop |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3632 ;; Use VAR's `variable-interactive' property |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3633 ;; as an interactive spec for prompting. |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3634 (call-interactively `(lambda (arg) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3635 (interactive ,prop) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3636 arg)) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3637 (read |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3638 (read-string prompt nil |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3639 'set-variable-value-history))))) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3640 (list var val))) |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3641 |
17613
7dadfa677617
(set-variable): Simplify previous change.
Richard M. Stallman <rms@gnu.org>
parents:
17606
diff
changeset
|
3642 (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
|
3643 (when type |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3644 ;; Match with custom type. |
38432
4bbb59858499
(set-variable): Require 'cus-edit' instead of
Gerd Moellmann <gerd@gnu.org>
parents:
38027
diff
changeset
|
3645 (require 'cus-edit) |
17606
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
3646 (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
|
3647 (unless (widget-apply type :match val) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
3648 (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
|
3649 val (car type) var)))) |
35203
dcf1f0621dbb
(set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents:
34909
diff
changeset
|
3650 (set var val) |
dcf1f0621dbb
(set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents:
34909
diff
changeset
|
3651 |
dcf1f0621dbb
(set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents:
34909
diff
changeset
|
3652 ;; 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
|
3653 ;; 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
|
3654 (force-mode-line-update)) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
3655 |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3656 ;; Define the major mode for lists of completions. |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
3657 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3658 (defvar completion-list-mode-map nil |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3659 "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
|
3660 (or completion-list-mode-map |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3661 (let ((map (make-sparse-keymap))) |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3662 (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
|
3663 (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
|
3664 (define-key map "\C-m" 'choose-completion) |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3665 (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
|
3666 (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
|
3667 (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
|
3668 (setq completion-list-mode-map map))) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3669 |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3670 ;; 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
|
3671 (put 'completion-list-mode 'mode-class 'special) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3672 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3673 (defvar completion-reference-buffer nil |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3674 "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
|
3675 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
|
3676 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
|
3677 |
16924
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
3678 (defvar completion-no-auto-exit nil |
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
3679 "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
|
3680 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
|
3681 and `mouse-choose-completion'.") |
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
3682 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3683 (defvar completion-base-size nil |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3684 "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
|
3685 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
|
3686 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
|
3687 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
|
3688 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
|
3689 |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3690 (defun delete-completion-window () |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3691 "Delete the completion list window. |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3692 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
|
3693 (interactive) |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3694 (let ((buf completion-reference-buffer)) |
16851
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
3695 (if (one-window-p t) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
3696 (if (window-dedicated-p (selected-window)) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
3697 (delete-frame (selected-frame))) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
3698 (delete-window (selected-window)) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
3699 (if (get-buffer-window buf) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
3700 (select-window (get-buffer-window buf)))))) |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
3701 |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
3702 (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
|
3703 "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
|
3704 (interactive "p") |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
3705 (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
|
3706 |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
3707 (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
|
3708 "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
|
3709 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
|
3710 (interactive "p") |
33781
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
3711 (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
|
3712 (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
|
3713 ;; 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
|
3714 (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
|
3715 (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
|
3716 ;; 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
|
3717 (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
|
3718 (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
|
3719 (setq n (1- n))) |
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
3720 (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
|
3721 (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
|
3722 ;; 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
|
3723 (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
|
3724 (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
|
3725 (point) 'mouse-face nil beg))) |
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
3726 ;; 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
|
3727 (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
|
3728 (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
|
3729 (point) 'mouse-face nil beg))) |
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
3730 ;; 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
|
3731 (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
|
3732 (point) 'mouse-face nil beg)) |
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
3733 (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
|
3734 |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3735 (defun choose-completion () |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3736 "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
|
3737 (interactive) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3738 (let (beg end completion (buffer completion-reference-buffer) |
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3739 (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
|
3740 (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
|
3741 (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
|
3742 (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
|
3743 (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
|
3744 (if (null beg) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
3745 (error "No completion here")) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
3746 (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
|
3747 (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
|
3748 (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
|
3749 (let ((owindow (selected-window))) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
3750 (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
|
3751 (window-dedicated-p (selected-window))) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
3752 ;; 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
|
3753 (iconify-frame (selected-frame)) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
3754 (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
|
3755 (bury-buffer))) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
3756 (select-window owindow)) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3757 (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
|
3758 |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3759 ;; 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
|
3760 ;; that can be found before POINT. |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3761 (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
|
3762 (let ((opoint (point)) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3763 (len (min (length string) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3764 (- (point) (point-min))))) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3765 (goto-char (- (point) (length string))) |
7574
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
3766 (if completion-ignore-case |
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
3767 (setq string (downcase string))) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3768 (while (and (> len 0) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3769 (let ((tail (buffer-substring (point) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3770 (+ (point) len)))) |
7574
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
3771 (if completion-ignore-case |
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
3772 (setq tail (downcase tail))) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3773 (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
|
3774 (setq len (1- len)) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3775 (forward-char 1)) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3776 (delete-char len))) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3777 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3778 ;; Switch to BUFFER and insert the completion choice CHOICE. |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3779 ;; BASE-SIZE, if non-nil, says how many characters of BUFFER's text |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3780 ;; to keep. If it is nil, use choose-completion-delete-max-match instead. |
15484
e3f8bfd1bb1f
(choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
15431
diff
changeset
|
3781 |
e3f8bfd1bb1f
(choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
15431
diff
changeset
|
3782 ;; If BUFFER is the minibuffer, exit the minibuffer |
16924
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
3783 ;; unless it is reading a file name and CHOICE is a directory, |
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
3784 ;; or completion-no-auto-exit is non-nil. |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3785 (defun choose-completion-string (choice &optional buffer base-size) |
27050
5c0c5089979c
(choose-completion-string): In minibuffer,
Richard M. Stallman <rms@gnu.org>
parents:
26884
diff
changeset
|
3786 (let ((buffer (or buffer completion-reference-buffer)) |
5c0c5089979c
(choose-completion-string): In minibuffer,
Richard M. Stallman <rms@gnu.org>
parents:
26884
diff
changeset
|
3787 (mini-p (string-match "\\` \\*Minibuf-[0-9]+\\*\\'" (buffer-name buffer)))) |
7333
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
3788 ;; 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
|
3789 ;; active minibuffer. |
27050
5c0c5089979c
(choose-completion-string): In minibuffer,
Richard M. Stallman <rms@gnu.org>
parents:
26884
diff
changeset
|
3790 (if (and mini-p |
11159
edf66df6fbe9
(choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
11140
diff
changeset
|
3791 (or (not (active-minibuffer-window)) |
edf66df6fbe9
(choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
11140
diff
changeset
|
3792 (not (equal buffer |
edf66df6fbe9
(choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
11140
diff
changeset
|
3793 (window-buffer (active-minibuffer-window)))))) |
7333
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
3794 (error "Minibuffer is not active for completion") |
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
3795 ;; Insert the completion into the buffer where completion was requested. |
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
3796 (set-buffer buffer) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3797 (if base-size |
27050
5c0c5089979c
(choose-completion-string): In minibuffer,
Richard M. Stallman <rms@gnu.org>
parents:
26884
diff
changeset
|
3798 (delete-region (+ base-size (if mini-p |
5c0c5089979c
(choose-completion-string): In minibuffer,
Richard M. Stallman <rms@gnu.org>
parents:
26884
diff
changeset
|
3799 (minibuffer-prompt-end) |
5c0c5089979c
(choose-completion-string): In minibuffer,
Richard M. Stallman <rms@gnu.org>
parents:
26884
diff
changeset
|
3800 (point-min))) |
5c0c5089979c
(choose-completion-string): In minibuffer,
Richard M. Stallman <rms@gnu.org>
parents:
26884
diff
changeset
|
3801 (point)) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3802 (choose-completion-delete-max-match choice)) |
7333
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
3803 (insert choice) |
7697
b52a92ea3796
(choose-completion-string): Clear mouse-face property.
Richard M. Stallman <rms@gnu.org>
parents:
7594
diff
changeset
|
3804 (remove-text-properties (- (point) (length choice)) (point) |
b52a92ea3796
(choose-completion-string): Clear mouse-face property.
Richard M. Stallman <rms@gnu.org>
parents:
7594
diff
changeset
|
3805 '(mouse-face nil)) |
7333
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
3806 ;; Update point in the window that BUFFER is showing in. |
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
3807 (let ((window (get-buffer-window buffer t))) |
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
3808 (set-window-point window (point))) |
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
3809 ;; If completing for the minibuffer, exit it with this choice. |
16924
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
3810 (and (not completion-no-auto-exit) |
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
3811 (equal buffer (window-buffer (minibuffer-window))) |
8559
509daefd2d13
(choose-completion-string): Use plain exit-minibuffer,
Richard M. Stallman <rms@gnu.org>
parents:
8479
diff
changeset
|
3812 minibuffer-completion-table |
15484
e3f8bfd1bb1f
(choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
15431
diff
changeset
|
3813 ;; If this is reading a file name, and the file name chosen |
e3f8bfd1bb1f
(choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
15431
diff
changeset
|
3814 ;; is a directory, don't exit the minibuffer. |
e3f8bfd1bb1f
(choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
15431
diff
changeset
|
3815 (if (and (eq minibuffer-completion-table 'read-file-name-internal) |
26054 | 3816 (file-directory-p (field-string (point-max)))) |
36668
5a5adc549cad
(choose-completion-string): When not leaving the
Gerd Moellmann <gerd@gnu.org>
parents:
36110
diff
changeset
|
3817 (let ((mini (active-minibuffer-window))) |
5a5adc549cad
(choose-completion-string): When not leaving the
Gerd Moellmann <gerd@gnu.org>
parents:
36110
diff
changeset
|
3818 (select-window mini) |
5a5adc549cad
(choose-completion-string): When not leaving the
Gerd Moellmann <gerd@gnu.org>
parents:
36110
diff
changeset
|
3819 (when minibuffer-auto-raise |
5a5adc549cad
(choose-completion-string): When not leaving the
Gerd Moellmann <gerd@gnu.org>
parents:
36110
diff
changeset
|
3820 (raise-frame (window-frame mini)))) |
15484
e3f8bfd1bb1f
(choose-completion-string): Don't exit the minibuffer
Richard M. Stallman <rms@gnu.org>
parents:
15431
diff
changeset
|
3821 (exit-minibuffer)))))) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3822 |
4217
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
3823 (defun completion-list-mode () |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3824 "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
|
3825 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
|
3826 to select the completion near point. |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3827 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
|
3828 with the mouse." |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3829 (interactive) |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3830 (kill-all-local-variables) |
4217
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
3831 (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
|
3832 (setq mode-name "Completion List") |
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
3833 (setq major-mode 'completion-list-mode) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3834 (make-local-variable 'completion-base-size) |
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
3835 (setq completion-base-size nil) |
4217
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
3836 (run-hooks 'completion-list-mode-hook)) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3837 |
37300
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
3838 (defun completion-list-mode-finish () |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
3839 "Finish setup of the completions buffer. |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
3840 Called from `temp-buffer-show-hook'." |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
3841 (when (eq major-mode 'completion-list-mode) |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
3842 (toggle-read-only 1))) |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
3843 |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
3844 (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
|
3845 |
20482
1fe822fa93e6
(completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents:
20465
diff
changeset
|
3846 (defvar completion-setup-hook nil |
1fe822fa93e6
(completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents:
20465
diff
changeset
|
3847 "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
|
3848 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
|
3849 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
|
3850 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
|
3851 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3852 ;; 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
|
3853 ;; 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
|
3854 |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3855 (defun completion-setup-function () |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3856 (save-excursion |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
3857 (let ((mainbuf (current-buffer))) |
6160
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
3858 (set-buffer standard-output) |
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
3859 (completion-list-mode) |
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
3860 (make-local-variable 'completion-reference-buffer) |
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
3861 (setq completion-reference-buffer mainbuf) |
18034
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3862 (if (eq minibuffer-completion-table 'read-file-name-internal) |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3863 ;; For file name completion, |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3864 ;; 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
|
3865 ;; last file name component. |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3866 (setq completion-base-size |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3867 (save-excursion |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3868 (set-buffer mainbuf) |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3869 (goto-char (point-max)) |
0d96c759902b
(line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents:
17874
diff
changeset
|
3870 (skip-chars-backward (format "^%c" directory-sep-char)) |
27096
e200e2db8e99
(completion-setup-function): Count completion-size
Eli Zaretskii <eliz@gnu.org>
parents:
27050
diff
changeset
|
3871 (- (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
|
3872 ;; 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
|
3873 (save-match-data |
84c681e58fd5
(completion-setup-function): Don't set completion-base-size
Richard M. Stallman <rms@gnu.org>
parents:
19160
diff
changeset
|
3874 (if (string-match "\\` \\*Minibuf-[0-9]+\\*\\'" |
84c681e58fd5
(completion-setup-function): Don't set completion-base-size
Richard M. Stallman <rms@gnu.org>
parents:
19160
diff
changeset
|
3875 (buffer-name mainbuf)) |
84c681e58fd5
(completion-setup-function): Don't set completion-base-size
Richard M. Stallman <rms@gnu.org>
parents:
19160
diff
changeset
|
3876 (setq completion-base-size 0)))) |
6160
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
3877 (goto-char (point-min)) |
28113
bfff8ed76f1c
(completion-setup-function): Use display-color-p.
Dave Love <fx@gnu.org>
parents:
27836
diff
changeset
|
3878 (if (display-mouse-p) |
6160
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
3879 (insert (substitute-command-keys |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3880 "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
|
3881 (insert (substitute-command-keys |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
3882 "In this buffer, type \\[choose-completion] to \ |
23450
085606778286
(completion-fixup-function): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
23447
diff
changeset
|
3883 select the completion near point.\n\n"))))) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3884 |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
3885 (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
|
3886 |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
3887 (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
|
3888 '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
|
3889 (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
|
3890 '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
|
3891 (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
|
3892 '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
|
3893 (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
|
3894 '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
|
3895 |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
3896 (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
|
3897 "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
|
3898 (interactive) |
12483
ec77cb3940f1
(switch-to-completions): Make a completions window if none.
Richard M. Stallman <rms@gnu.org>
parents:
12428
diff
changeset
|
3899 ;; 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
|
3900 (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
|
3901 (minibuffer-completion-help)) |
20663
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
3902 (let ((window (get-buffer-window "*Completions*"))) |
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
3903 (when window |
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
3904 (select-window window) |
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
3905 (goto-char (point-min)) |
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
3906 (search-forward "\n\n") |
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
3907 (forward-line 1)))) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
3908 |
11140
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3909 ;; Support keyboard commands to turn on various modifiers. |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3910 |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3911 ;; 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
|
3912 ;; to the following event. |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3913 |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3914 (defun event-apply-alt-modifier (ignore-prompt) |
22324
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
3915 "Add the Alt modifier to the following event. |
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
3916 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
|
3917 (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
|
3918 (defun event-apply-super-modifier (ignore-prompt) |
22324
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
3919 "Add the Super modifier to the following event. |
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
3920 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
|
3921 (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
|
3922 (defun event-apply-hyper-modifier (ignore-prompt) |
22324
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
3923 "Add the Hyper modifier to the following event. |
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
3924 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
|
3925 (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
|
3926 (defun event-apply-shift-modifier (ignore-prompt) |
22324
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
3927 "Add the Shift modifier to the following event. |
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
3928 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
|
3929 (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
|
3930 (defun event-apply-control-modifier (ignore-prompt) |
22324
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
3931 "Add the Ctrl modifier to the following event. |
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
3932 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
|
3933 (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
|
3934 (defun event-apply-meta-modifier (ignore-prompt) |
22324
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
3935 "Add the Meta modifier to the following event. |
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
3936 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
|
3937 (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
|
3938 |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3939 (defun event-apply-modifier (event symbol lshiftby prefix) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3940 "Apply a modifier flag to event EVENT. |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3941 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
|
3942 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
|
3943 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
|
3944 (if (numberp event) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3945 (cond ((eq symbol 'control) |
11201
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
3946 (if (and (<= (downcase event) ?z) |
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
3947 (>= (downcase event) ?a)) |
11140
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3948 (- (downcase event) ?a -1) |
11201
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
3949 (if (and (<= (downcase event) ?Z) |
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
3950 (>= (downcase event) ?A)) |
11140
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3951 (- (downcase event) ?A -1) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3952 (logior (lsh 1 lshiftby) event)))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3953 ((eq symbol 'shift) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3954 (if (and (<= (downcase event) ?z) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3955 (>= (downcase event) ?a)) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3956 (upcase event) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3957 (logior (lsh 1 lshiftby) event))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3958 (t |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3959 (logior (lsh 1 lshiftby) event))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3960 (if (memq symbol (event-modifiers event)) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3961 event |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3962 (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
|
3963 (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
|
3964 (if (symbolp event) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3965 event-type |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3966 (cons event-type (cdr event))))))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
3967 |
11206
60b7ab7d4fec
Change bindings of event-apply-control-modifier,
Karl Heuer <kwzh@gnu.org>
parents:
11201
diff
changeset
|
3968 (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
|
3969 (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
|
3970 (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
|
3971 (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
|
3972 (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
|
3973 (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
|
3974 |
3947
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3975 ;;;; Keypad support. |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3976 |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3977 ;;; 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
|
3978 ;;; 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
|
3979 ;;; 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
|
3980 ;;; bindings. |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3981 |
5342
f38861038093
(setting up kp-... keys): Make ascii-character props.
Richard M. Stallman <rms@gnu.org>
parents:
5324
diff
changeset
|
3982 ;; 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
|
3983 (mapc |
3947
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3984 (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
|
3985 (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
|
3986 (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
|
3987 (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
|
3988 (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
|
3989 '((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
|
3990 (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
|
3991 (kp-space ?\ ) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3992 (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
|
3993 (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
|
3994 (kp-multiply ?*) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3995 (kp-add ?+) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3996 (kp-separator ?,) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3997 (kp-subtract ?-) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3998 (kp-decimal ?.) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
3999 (kp-divide ?/) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
4000 (kp-equal ?=))) |
44906
fe8ce22fc4a1
(next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents:
44756
diff
changeset
|
4001 |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
4002 ;;;; |
26003
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4003 ;;;; forking a twin copy of a buffer. |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
4004 ;;;; |
26003
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4005 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4006 (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
|
4007 "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
|
4008 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4009 (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
|
4010 "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
|
4011 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
|
4012 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
|
4013 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
|
4014 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
|
4015 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
|
4016 (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
|
4017 (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
|
4018 (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
|
4019 (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
|
4020 (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
|
4021 (new-process |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4022 (if (memq (process-status process) '(open)) |
43969 | 4023 (let ((args (process-contact process t))) |
4024 (setq args (plist-put args :name newname)) | |
4025 (setq args (plist-put args :buffer | |
4026 (if (process-buffer process) (current-buffer)))) | |
4027 (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
|
4028 (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
|
4029 (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
|
4030 (process-command process))))) |
43969 | 4031 (set-process-query-on-exit-flag |
4032 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
|
4033 (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
|
4034 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
|
4035 (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
|
4036 (set-process-sentinel new-process (process-sentinel process)) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4037 new-process))) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4038 |
44152 | 4039 ;; 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
|
4040 ;; - syntax-table |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4041 ;; - overlays |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4042 (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
|
4043 "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
|
4044 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
|
4045 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
|
4046 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4047 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
|
4048 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
|
4049 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
|
4050 (interactive |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
4051 (progn |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
4052 (if buffer-file-name |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
4053 (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
|
4054 (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
|
4055 (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
|
4056 (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
|
4057 t))) |
26003
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4058 (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
|
4059 (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
|
4060 (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
|
4061 (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
|
4062 (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
|
4063 (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
|
4064 (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
|
4065 (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
|
4066 (ptmin (point-min)) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4067 (ptmax (point-max)) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4068 (pt (point)) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4069 (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
|
4070 (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
|
4071 (mode major-mode) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4072 (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
|
4073 (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
|
4074 (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
|
4075 (save-restriction |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4076 (widen) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4077 (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
|
4078 (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
|
4079 (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
|
4080 (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
|
4081 (goto-char pt) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4082 (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
|
4083 (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
|
4084 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4085 ;; 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
|
4086 (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
|
4087 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4088 ;; 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
|
4089 (funcall mode) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4090 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4091 ;; 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
|
4092 (mapcar (lambda (v) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4093 (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
|
4094 (if (symbolp v) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4095 (makunbound v) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4096 (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
|
4097 (error nil))) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4098 lvars) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4099 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4100 ;; 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
|
4101 ;; 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
|
4102 (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
|
4103 (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
|
4104 new)) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
4105 |
28624
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
4106 |
28659
17281c5a2834
(clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents:
28624
diff
changeset
|
4107 (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
|
4108 "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
|
4109 |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
4110 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
|
4111 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
|
4112 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
|
4113 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
|
4114 or by incrementing the N in an existing suffix. |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
4115 |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
4116 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
|
4117 This is always done when called interactively. |
17281c5a2834
(clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents:
28624
diff
changeset
|
4118 |
17281c5a2834
(clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents:
28624
diff
changeset
|
4119 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
|
4120 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
|
4121 (interactive |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
4122 (progn |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
4123 (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
|
4124 (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
|
4125 (list (if current-prefix-arg |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
4126 (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
|
4127 t))) |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
4128 (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
|
4129 (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
|
4130 (setq newname (or newname (buffer-name))) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
4131 (if (string-match "<[0-9]+>\\'" newname) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
4132 (setq newname (substring newname 0 (match-beginning 0)))) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
4133 (let* ((name (generate-new-buffer-name newname)) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
4134 (buffer (make-indirect-buffer (current-buffer) name t))) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
4135 (when display-flag |
33781
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
4136 (pop-to-buffer buffer norecord)) |
28624
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
4137 buffer)) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
4138 |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
4139 |
28659
17281c5a2834
(clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents:
28624
diff
changeset
|
4140 (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
|
4141 "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
|
4142 Select the new buffer in another window. |
17281c5a2834
(clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents:
28624
diff
changeset
|
4143 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
|
4144 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
|
4145 (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
|
4146 (let ((pop-up-windows t)) |
28659
17281c5a2834
(clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents:
28624
diff
changeset
|
4147 (set-buffer buffer) |
17281c5a2834
(clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents:
28624
diff
changeset
|
4148 (clone-indirect-buffer nil t norecord))) |
17281c5a2834
(clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents:
28624
diff
changeset
|
4149 |
28661
f78d389c773c
Fix typo in key binding of clone-indirect-buffer-other-window.
Gerd Moellmann <gerd@gnu.org>
parents:
28659
diff
changeset
|
4150 (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
|
4151 |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4152 ;;; Handling of Backspace and Delete keys. |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4153 |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4154 (defcustom normal-erase-is-backspace nil |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4155 "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
|
4156 |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4157 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
|
4158 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
|
4159 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
|
4160 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
|
4161 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
|
4162 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4163 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
|
4164 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
|
4165 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
|
4166 `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
|
4167 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
|
4168 have both Backspace, Delete and F1 keys. |
0f079e057295
(delete-key-deletes-forward): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
34713
diff
changeset
|
4169 |
0f079e057295
(delete-key-deletes-forward): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
34713
diff
changeset
|
4170 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
|
4171 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
|
4172 :type 'boolean |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4173 :group 'editing-basics |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4174 :version "21.1" |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4175 :set (lambda (symbol value) |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4176 ;; 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
|
4177 ;; dumping Emacs. It doesn't really matter. |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4178 (if (fboundp 'normal-erase-is-backspace-mode) |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4179 (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
|
4180 (set-default symbol value)))) |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4181 |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4182 |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4183 (defun normal-erase-is-backspace-mode (&optional arg) |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4184 "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
|
4185 |
37248
dadde28d1d99
(normal-erase-is-backspace-mode): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
37194
diff
changeset
|
4186 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
|
4187 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4188 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
|
4189 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
|
4190 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
|
4191 `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
|
4192 local keymap will override that.) |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4193 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4194 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
|
4195 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
|
4196 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
|
4197 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
|
4198 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
|
4199 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
|
4200 `backward-kill-word'. |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4201 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4202 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
|
4203 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
|
4204 `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
|
4205 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
|
4206 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4207 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
|
4208 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
|
4209 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
|
4210 have both Backspace, Delete and F1 keys. |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4211 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4212 See also `normal-erase-is-backspace'." |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4213 (interactive "P") |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4214 (setq normal-erase-is-backspace |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4215 (if arg |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4216 (> (prefix-numeric-value arg) 0) |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4217 (not normal-erase-is-backspace))) |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4218 |
34570
f6aeb731a068
(delete-key-deletes-forward-mode): Treat ms-dos and
Eli Zaretskii <eliz@gnu.org>
parents:
34553
diff
changeset
|
4219 (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
|
4220 (memq system-type '(ms-dos windows-nt))) |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4221 (let ((bindings |
36030
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
4222 `(([C-delete] [C-backspace]) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
4223 ([M-delete] [M-backspace]) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
4224 ([C-M-delete] [C-M-backspace]) |
35346
382fba2f10a6
(delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents:
35333
diff
changeset
|
4225 (,esc-map |
36030
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
4226 [C-delete] [C-backspace]))) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
4227 (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
|
4228 |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4229 (if normal-erase-is-backspace |
35346
382fba2f10a6
(delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents:
35333
diff
changeset
|
4230 (progn |
382fba2f10a6
(delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents:
35333
diff
changeset
|
4231 (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
|
4232 (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
|
4233 (define-key function-key-map [backspace] [?\C-?])) |
382fba2f10a6
(delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents:
35333
diff
changeset
|
4234 (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
|
4235 (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
|
4236 (define-key function-key-map [backspace] [?\C-?])) |
382fba2f10a6
(delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents:
35333
diff
changeset
|
4237 |
36030
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
4238 ;; 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
|
4239 (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
|
4240 (dolist (binding bindings) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
4241 (let ((map global-map)) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
4242 (when (keymapp (car binding)) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
4243 (setq map (car binding) binding (cdr binding))) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
4244 (let* ((key1 (nth 0 binding)) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
4245 (key2 (nth 1 binding)) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
4246 (binding1 (lookup-key map key1)) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
4247 (binding2 (lookup-key map key2))) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
4248 (define-key map key1 binding2) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
4249 (define-key map key2 binding1))))))) |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4250 (t |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4251 (if normal-erase-is-backspace |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4252 (progn |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4253 (keyboard-translate ?\C-h ?\C-?) |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4254 (keyboard-translate ?\C-? ?\C-d)) |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4255 (keyboard-translate ?\C-h ?\C-h) |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4256 (keyboard-translate ?\C-? ?\C-?)))) |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
4257 |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4258 (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
|
4259 (if (interactive-p) |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4260 (message "Delete key deletes %s" |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4261 (if normal-erase-is-backspace "forward" "backward")))) |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4262 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
4263 |
43969 | 4264 ;;; make-network-process wrappers |
4265 | |
44070
51fae9813831
Test for network process support with featurep.
Kim F. Storm <storm@cua.dk>
parents:
44069
diff
changeset
|
4266 (if (featurep 'make-network-process) |
43969 | 4267 (progn |
4268 | |
4269 (defun open-network-stream (name buffer host service) | |
4270 "Open a TCP connection for a service to a host. | |
4271 Returns a subprocess-object to represent the connection. | |
4272 Input and output work as for subprocesses; `delete-process' closes it. | |
4273 Args are NAME BUFFER HOST SERVICE. | |
4274 NAME is name for process. It is modified if necessary to make it unique. | |
4275 BUFFER is the buffer (or buffer-name) to associate with the process. | |
4276 Process output goes at end of that buffer, unless you specify | |
4277 an output stream or filter function to handle the output. | |
4278 BUFFER may be also nil, meaning that this process is not associated | |
4279 with any buffer | |
4280 Third arg is name of the host to connect to, or its IP address. | |
4281 Fourth arg SERVICE is name of the service desired, or an integer | |
4282 specifying a port number to connect to." | |
4283 (make-network-process :name name :buffer buffer | |
4284 :host host :service service)) | |
4285 | |
4286 (defun open-network-stream-nowait (name buffer host service &optional sentinel filter) | |
4287 "Initiate connection to a TCP connection for a service to a host. | |
4288 It returns nil if non-blocking connects are not supported; otherwise, | |
4289 it returns a subprocess-object to represent the connection. | |
4290 | |
4291 This function is similar to `open-network-stream', except that this | |
4292 function returns before the connection is established. When the | |
4293 connection is completed, the sentinel function will be called with | |
4294 second arg matching `open' (if successful) or `failed' (on error). | |
4295 | |
4296 Args are NAME BUFFER HOST SERVICE SENTINEL FILTER. | |
4297 NAME, BUFFER, HOST, and SERVICE are as for `open-network-stream'. | |
4298 Optional args, SENTINEL and FILTER specifies the sentinel and filter | |
4299 functions to be used for this network stream." | |
44069
a980adfcce47
(open-network-stream-nowait): Use featurep.
Kim F. Storm <storm@cua.dk>
parents:
43969
diff
changeset
|
4300 (if (featurep 'make-network-process '(:nowait t)) |
43969 | 4301 (make-network-process :name name :buffer buffer :nowait t |
4302 :host host :service service | |
4303 :filter filter :sentinel sentinel))) | |
4304 | |
4305 (defun open-network-stream-server (name buffer service &optional sentinel filter) | |
4306 "Create a network server process for a TCP service. | |
4307 It returns nil if server processes are not supported; otherwise, | |
4308 it returns a subprocess-object to represent the server. | |
4309 | |
4310 When a client connects to the specified service, a new subprocess | |
4311 is created to handle the new connection, and the sentinel function | |
4312 is called for the new process. | |
4313 | |
4314 Args are NAME BUFFER SERVICE SENTINEL FILTER. | |
4315 NAME is name for the server process. Client processes are named by | |
4316 appending the ip-address and port number of the client to NAME. | |
4317 BUFFER is the buffer (or buffer-name) to associate with the server | |
4318 process. Client processes will not get a buffer if a process filter | |
4319 is specified or BUFFER is nil; otherwise, a new buffer is created for | |
4320 the client process. The name is similar to the process name. | |
4321 Third arg SERVICE is name of the service desired, or an integer | |
4322 specifying a port number to connect to. It may also be t to selected | |
4323 an unused port number for the server. | |
4324 Optional args, SENTINEL and FILTER specifies the sentinel and filter | |
4325 functions to be used for the client processes; the server process | |
4326 does not use these function." | |
44069
a980adfcce47
(open-network-stream-nowait): Use featurep.
Kim F. Storm <storm@cua.dk>
parents:
43969
diff
changeset
|
4327 (if (featurep 'make-network-process '(:server t)) |
43969 | 4328 (make-network-process :name name :buffer buffer |
4329 :service service :server t :noquery t))) | |
4330 | |
44070
51fae9813831
Test for network process support with featurep.
Kim F. Storm <storm@cua.dk>
parents:
44069
diff
changeset
|
4331 )) ;; (featurep 'make-network-process) |
43969 | 4332 |
4333 | |
4334 ;; compatibility | |
4335 | |
4336 (defun process-kill-without-query (process &optional flag) | |
4337 "Say no query needed if PROCESS is running when Emacs is exited. | |
4338 Optional second argument if non-nil says to require a query. | |
4339 Value is t if a query was formerly required. | |
4340 New code should not use this function; use `process-query-on-exit-flag' | |
4341 or `set-process-query-on-exit-flag' instead." | |
4342 (let ((old (process-query-on-exit-flag process))) | |
4343 (set-process-query-on-exit-flag process nil) | |
4344 old)) | |
4345 | |
33352
bd48e8729dbb
(byte-compiling-files-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
33312
diff
changeset
|
4346 ;;; Misc |
bd48e8729dbb
(byte-compiling-files-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
33312
diff
changeset
|
4347 |
bd48e8729dbb
(byte-compiling-files-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
33312
diff
changeset
|
4348 (defun byte-compiling-files-p () |
bd48e8729dbb
(byte-compiling-files-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
33312
diff
changeset
|
4349 "Return t if currently byte-compiling files." |
bd48e8729dbb
(byte-compiling-files-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
33312
diff
changeset
|
4350 (and (boundp 'byte-compile-current-file) |
bd48e8729dbb
(byte-compiling-files-p): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
33312
diff
changeset
|
4351 (stringp byte-compile-current-file))) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
4352 |
39271
d56dcab29cce
(minibuffer-prompt-modification)
Gerd Moellmann <gerd@gnu.org>
parents:
39157
diff
changeset
|
4353 |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4354 ;; Minibuffer prompt stuff. |
39271
d56dcab29cce
(minibuffer-prompt-modification)
Gerd Moellmann <gerd@gnu.org>
parents:
39157
diff
changeset
|
4355 |
39289
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
4356 ;(defun minibuffer-prompt-modification (start end) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
4357 ; (error "You cannot modify the prompt")) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
4358 ; |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
4359 ; |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
4360 ;(defun minibuffer-prompt-insertion (start end) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
4361 ; (let ((inhibit-modification-hooks t)) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
4362 ; (delete-region start end) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
4363 ; ;; 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
|
4364 ; ;; and for the text deletion.above. |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
4365 ; (when (consp buffer-undo-list) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
4366 ; (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
|
4367 ; (message "You cannot modify the prompt"))) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
4368 ; |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
4369 ; |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
4370 ;(setq minibuffer-prompt-properties |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
4371 ; (list 'modification-hooks '(minibuffer-prompt-modification) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
4372 ; 'insert-in-front-hooks '(minibuffer-prompt-insertion))) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
4373 ; |
39271
d56dcab29cce
(minibuffer-prompt-modification)
Gerd Moellmann <gerd@gnu.org>
parents:
39157
diff
changeset
|
4374 |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
4375 ;;; simple.el ends here |