Mercurial > emacs
annotate lisp/simple.el @ 103257:488dc577a7c2
* windows.texi (Cyclic Window Ordering, Cyclic Window Ordering)
(Displaying Buffers, Resizing Windows): Correct mistakes;
next-window, previous-window, and pop-to-buffer are not commands,
and fit-window-to-buffer" is a command. (Pointed out by Martin
Rudalics.)
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Tue, 19 May 2009 15:07:29 +0000 |
parents | 0f518b180240 |
children | 5cf7afafabf1 |
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 |
58754
b41534d7c63c
(blink-matching-open): Obey syntax-table text properties.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58625
diff
changeset
|
3 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
100908 | 4 ;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
79094 | 5 ;; Free Software Foundation, Inc. |
475 | 6 |
45078 | 7 ;; Maintainer: FSF |
8 ;; Keywords: internal | |
9 | |
475 | 10 ;; This file is part of GNU Emacs. |
11 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94464
diff
changeset
|
12 ;; GNU Emacs is free software: you can redistribute it and/or modify |
475 | 13 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94464
diff
changeset
|
14 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94464
diff
changeset
|
15 ;; (at your option) any later version. |
475 | 16 |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94464
diff
changeset
|
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
475 | 24 |
2315
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
25 ;;; Commentary: |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
26 |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
27 ;; 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
|
28 ;; major mode or to file-handling. |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
29 |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
30 ;;; Code: |
475 | 31 |
98949
46d6efaefafc
(apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents:
98892
diff
changeset
|
32 ;; This is for lexical-let in apply-partially. |
46d6efaefafc
(apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents:
98892
diff
changeset
|
33 (eval-when-compile (require 'cl)) |
46d6efaefafc
(apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents:
98892
diff
changeset
|
34 |
92948
73a01bf5cb80
* faces.el (xw-defined-colors):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92715
diff
changeset
|
35 (declare-function widget-convert "wid-edit" (type &rest args)) |
73a01bf5cb80
* faces.el (xw-defined-colors):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92715
diff
changeset
|
36 (declare-function shell-mode "shell" ()) |
26466 | 37 |
65295
0a6b52c97d53
(compilation-current-error): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
65173
diff
changeset
|
38 (defvar compilation-current-error) |
0a6b52c97d53
(compilation-current-error): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
65173
diff
changeset
|
39 |
61111
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
40 (defcustom idle-update-delay 0.5 |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
41 "Idle time delay before updating various things on the screen. |
61111
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
42 Various Emacs features that update auxiliary information when point moves |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
43 wait this many seconds after Emacs becomes idle before doing an update." |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
44 :type 'number |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
45 :group 'display |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
46 :version "22.1") |
26466 | 47 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
48 (defgroup killing nil |
56005
54d79ab53dd3
(eval-expression-print-format): Don't print additional
Juri Linkov <juri@jurta.org>
parents:
55975
diff
changeset
|
49 "Killing and yanking commands." |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
50 :group 'editing) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
51 |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
52 (defgroup paren-matching nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
53 "Highlight (un)matching of parens and expressions." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
54 :group 'matching) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
55 |
67777
8eda669e2619
(get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents:
67621
diff
changeset
|
56 (defun get-next-valid-buffer (list &optional buffer visible-ok frame) |
8eda669e2619
(get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents:
67621
diff
changeset
|
57 "Search LIST for a valid buffer to display in FRAME. |
67602
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
58 Return nil when all buffers in LIST are undesirable for display, |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
59 otherwise return the first suitable buffer in LIST. |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
60 |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
61 Buffers not visible in windows are preferred to visible buffers, |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
62 unless VISIBLE-OK is non-nil. |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
63 If the optional argument FRAME is nil, it defaults to the selected frame. |
67777
8eda669e2619
(get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents:
67621
diff
changeset
|
64 If BUFFER is non-nil, ignore occurrences of that buffer in LIST." |
67602
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
65 ;; This logic is more or less copied from other-buffer. |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
66 (setq frame (or frame (selected-frame))) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
67 (let ((pred (frame-parameter frame 'buffer-predicate)) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
68 found buf) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
69 (while (and (not found) list) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
70 (setq buf (car list)) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
71 (if (and (not (eq buffer buf)) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
72 (buffer-live-p buf) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
73 (or (null pred) (funcall pred buf)) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
74 (not (eq (aref (buffer-name buf) 0) ?\s)) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
75 (or visible-ok (null (get-buffer-window buf 'visible)))) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
76 (setq found buf) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
77 (setq list (cdr list)))) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
78 (car list))) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
79 |
67777
8eda669e2619
(get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents:
67621
diff
changeset
|
80 (defun last-buffer (&optional buffer visible-ok frame) |
100803
0186716f4b63
(last-buffer): Don't set major mode of *scratch* if
Martin Rudalics <rudalics@gmx.at>
parents:
100623
diff
changeset
|
81 "Return the last buffer in FRAME's buffer list. |
0186716f4b63
(last-buffer): Don't set major mode of *scratch* if
Martin Rudalics <rudalics@gmx.at>
parents:
100623
diff
changeset
|
82 If BUFFER is the last buffer, return the preceding buffer instead. |
67602
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
83 Buffers not visible in windows are preferred to visible buffers, |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
84 unless optional argument VISIBLE-OK is non-nil. |
100803
0186716f4b63
(last-buffer): Don't set major mode of *scratch* if
Martin Rudalics <rudalics@gmx.at>
parents:
100623
diff
changeset
|
85 Optional third argument FRAME nil or omitted means use the |
0186716f4b63
(last-buffer): Don't set major mode of *scratch* if
Martin Rudalics <rudalics@gmx.at>
parents:
100623
diff
changeset
|
86 selected frame's buffer list. |
0186716f4b63
(last-buffer): Don't set major mode of *scratch* if
Martin Rudalics <rudalics@gmx.at>
parents:
100623
diff
changeset
|
87 If no such buffer exists, return the buffer `*scratch*', creating |
0186716f4b63
(last-buffer): Don't set major mode of *scratch* if
Martin Rudalics <rudalics@gmx.at>
parents:
100623
diff
changeset
|
88 it if necessary." |
67602
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
89 (setq frame (or frame (selected-frame))) |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83414
diff
changeset
|
90 (or (get-next-valid-buffer (nreverse (buffer-list frame)) |
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83414
diff
changeset
|
91 buffer visible-ok frame) |
100803
0186716f4b63
(last-buffer): Don't set major mode of *scratch* if
Martin Rudalics <rudalics@gmx.at>
parents:
100623
diff
changeset
|
92 (get-buffer "*scratch*") |
0186716f4b63
(last-buffer): Don't set major mode of *scratch* if
Martin Rudalics <rudalics@gmx.at>
parents:
100623
diff
changeset
|
93 (let ((scratch (get-buffer-create "*scratch*"))) |
0186716f4b63
(last-buffer): Don't set major mode of *scratch* if
Martin Rudalics <rudalics@gmx.at>
parents:
100623
diff
changeset
|
94 (set-buffer-major-mode scratch) |
0186716f4b63
(last-buffer): Don't set major mode of *scratch* if
Martin Rudalics <rudalics@gmx.at>
parents:
100623
diff
changeset
|
95 scratch))) |
0186716f4b63
(last-buffer): Don't set major mode of *scratch* if
Martin Rudalics <rudalics@gmx.at>
parents:
100623
diff
changeset
|
96 |
44906
fe8ce22fc4a1
(next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents:
44756
diff
changeset
|
97 (defun next-buffer () |
fe8ce22fc4a1
(next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents:
44756
diff
changeset
|
98 "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
|
99 (interactive) |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83414
diff
changeset
|
100 (let ((buffer (current-buffer))) |
67602
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
101 (switch-to-buffer (other-buffer buffer t)) |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83414
diff
changeset
|
102 (bury-buffer buffer))) |
67602
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
103 |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
104 (defun previous-buffer () |
44906
fe8ce22fc4a1
(next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents:
44756
diff
changeset
|
105 "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
|
106 (interactive) |
83415
d2c799f58129
Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents:
83414
diff
changeset
|
107 (switch-to-buffer (last-buffer (current-buffer) t))) |
67602
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
108 |
56863
c8bb5aca0581
* simple.el (next-error): New defgroup and defface.
Juri Linkov <juri@jurta.org>
parents:
56862
diff
changeset
|
109 |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
110 ;;; next-error support framework |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
111 |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
112 (defgroup next-error nil |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
113 "`next-error' support framework." |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
114 :group 'compilation |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59790
diff
changeset
|
115 :version "22.1") |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
116 |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
117 (defface next-error |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
118 '((t (:inherit region))) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
119 "Face used to highlight next error locus." |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
120 :group 'next-error |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59790
diff
changeset
|
121 :version "22.1") |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
122 |
73101
b584d304b053
(next-error-highlight, next-error-highlight-no-select): Default to 0.5.
Richard M. Stallman <rms@gnu.org>
parents:
73014
diff
changeset
|
123 (defcustom next-error-highlight 0.5 |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
124 "Highlighting of locations in selected source buffers. |
76785
bb2e03ff11bc
(next-error-highlight): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
76634
diff
changeset
|
125 If a number, highlight the locus in `next-error' face for the given time |
bb2e03ff11bc
(next-error-highlight): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
76634
diff
changeset
|
126 in seconds, or until the next command is executed. |
bb2e03ff11bc
(next-error-highlight): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
76634
diff
changeset
|
127 If t, highlight the locus until the next command is executed, or until |
bb2e03ff11bc
(next-error-highlight): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
76634
diff
changeset
|
128 some other locus replaces it. |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
129 If nil, don't highlight the locus in the source buffer. |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
130 If `fringe-arrow', indicate the locus by the fringe arrow." |
72814
05aacac5e80f
(next-error-highlight, next-error-highlight-no-select):
Richard M. Stallman <rms@gnu.org>
parents:
72666
diff
changeset
|
131 :type '(choice (number :tag "Highlight for specified time") |
72819
88df7387d588
(next-error-highlight, next-error-highlight-no-select):
Kim F. Storm <storm@cua.dk>
parents:
72814
diff
changeset
|
132 (const :tag "Semipermanent highlighting" t) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
133 (const :tag "No highlighting" nil) |
72814
05aacac5e80f
(next-error-highlight, next-error-highlight-no-select):
Richard M. Stallman <rms@gnu.org>
parents:
72666
diff
changeset
|
134 (const :tag "Fringe arrow" fringe-arrow)) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
135 :group 'next-error |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59790
diff
changeset
|
136 :version "22.1") |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
137 |
73101
b584d304b053
(next-error-highlight, next-error-highlight-no-select): Default to 0.5.
Richard M. Stallman <rms@gnu.org>
parents:
73014
diff
changeset
|
138 (defcustom next-error-highlight-no-select 0.5 |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
139 "Highlighting of locations in `next-error-no-select'. |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
140 If number, highlight the locus in `next-error' face for given time in seconds. |
72814
05aacac5e80f
(next-error-highlight, next-error-highlight-no-select):
Richard M. Stallman <rms@gnu.org>
parents:
72666
diff
changeset
|
141 If t, highlight the locus indefinitely until some other locus replaces it. |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
142 If nil, don't highlight the locus in the source buffer. |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
143 If `fringe-arrow', indicate the locus by the fringe arrow." |
72814
05aacac5e80f
(next-error-highlight, next-error-highlight-no-select):
Richard M. Stallman <rms@gnu.org>
parents:
72666
diff
changeset
|
144 :type '(choice (number :tag "Highlight for specified time") |
72819
88df7387d588
(next-error-highlight, next-error-highlight-no-select):
Kim F. Storm <storm@cua.dk>
parents:
72814
diff
changeset
|
145 (const :tag "Semipermanent highlighting" t) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
146 (const :tag "No highlighting" nil) |
72814
05aacac5e80f
(next-error-highlight, next-error-highlight-no-select):
Richard M. Stallman <rms@gnu.org>
parents:
72666
diff
changeset
|
147 (const :tag "Fringe arrow" fringe-arrow)) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
148 :group 'next-error |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59790
diff
changeset
|
149 :version "22.1") |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
150 |
81551
a39eb4ca5597
(next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
77750
diff
changeset
|
151 (defcustom next-error-recenter nil |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
152 "Display the line in the visited source file recentered as specified. |
81587
7be7263c7d7f
(next-error-recenter): Accept `(4)' as well;
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
81551
diff
changeset
|
153 If non-nil, the value is passed directly to `recenter'." |
7be7263c7d7f
(next-error-recenter): Accept `(4)' as well;
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
81551
diff
changeset
|
154 :type '(choice (integer :tag "Line to recenter to") |
7be7263c7d7f
(next-error-recenter): Accept `(4)' as well;
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
81551
diff
changeset
|
155 (const :tag "Center of window" (4)) |
81551
a39eb4ca5597
(next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
77750
diff
changeset
|
156 (const :tag "No recentering" nil)) |
a39eb4ca5597
(next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
77750
diff
changeset
|
157 :group 'next-error |
a39eb4ca5597
(next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
77750
diff
changeset
|
158 :version "23.1") |
a39eb4ca5597
(next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
77750
diff
changeset
|
159 |
64195
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
160 (defcustom next-error-hook nil |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
161 "List of hook functions run by `next-error' after visiting source file." |
64195
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
162 :type 'hook |
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
163 :group 'next-error) |
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
164 |
61070
ed6d9a5fc534
(next-error-highlight-timer): New variable.
Juri Linkov <juri@jurta.org>
parents:
60744
diff
changeset
|
165 (defvar next-error-highlight-timer nil) |
ed6d9a5fc534
(next-error-highlight-timer): New variable.
Juri Linkov <juri@jurta.org>
parents:
60744
diff
changeset
|
166 |
61361
d5052fc4ea58
(next-error-overlay-arrow-position): New defvar.
Juri Linkov <juri@jurta.org>
parents:
61276
diff
changeset
|
167 (defvar next-error-overlay-arrow-position nil) |
62179
10a82ef7d0a9
(next-error-overlay-arrow-position): Revert the change made on 2005-04-30.
Eli Zaretskii <eliz@gnu.org>
parents:
62093
diff
changeset
|
168 (put 'next-error-overlay-arrow-position 'overlay-arrow-string "=>") |
61361
d5052fc4ea58
(next-error-overlay-arrow-position): New defvar.
Juri Linkov <juri@jurta.org>
parents:
61276
diff
changeset
|
169 (add-to-list 'overlay-arrow-variable-list 'next-error-overlay-arrow-position) |
d5052fc4ea58
(next-error-overlay-arrow-position): New defvar.
Juri Linkov <juri@jurta.org>
parents:
61276
diff
changeset
|
170 |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
171 (defvar next-error-last-buffer nil |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
172 "The most recent `next-error' buffer. |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
173 A buffer becomes most recent when its compilation, grep, or |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
174 similar mode is started, or when it is used with \\[next-error] |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
175 or \\[compile-goto-error].") |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
176 |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
177 (defvar next-error-function nil |
55087
6831f7668364
(next-error): Change arg name. Add support for the documented C-u C-x ` usage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55066
diff
changeset
|
178 "Function to use to find the next error in the current buffer. |
6831f7668364
(next-error): Change arg name. Add support for the documented C-u C-x ` usage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55066
diff
changeset
|
179 The function is called with 2 parameters: |
6831f7668364
(next-error): Change arg name. Add support for the documented C-u C-x ` usage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55066
diff
changeset
|
180 ARG is an integer specifying by how many errors to move. |
6831f7668364
(next-error): Change arg name. Add support for the documented C-u C-x ` usage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55066
diff
changeset
|
181 RESET is a boolean which, if non-nil, says to go back to the beginning |
6831f7668364
(next-error): Change arg name. Add support for the documented C-u C-x ` usage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55066
diff
changeset
|
182 of the errors before moving. |
6831f7668364
(next-error): Change arg name. Add support for the documented C-u C-x ` usage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55066
diff
changeset
|
183 Major modes providing compile-like functionality should set this variable |
6831f7668364
(next-error): Change arg name. Add support for the documented C-u C-x ` usage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55066
diff
changeset
|
184 to indicate to `next-error' that this is a candidate buffer and how |
6831f7668364
(next-error): Change arg name. Add support for the documented C-u C-x ` usage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55066
diff
changeset
|
185 to navigate in it.") |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
186 |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
187 (make-variable-buffer-local 'next-error-function) |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
188 |
58951
c7ebd794182b
(next-error-buffer-p, next-error-find-buffer): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
58917
diff
changeset
|
189 (defsubst next-error-buffer-p (buffer |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
190 &optional avoid-current |
58951
c7ebd794182b
(next-error-buffer-p, next-error-find-buffer): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
58917
diff
changeset
|
191 extra-test-inclusive |
58625
31d0b9422d7b
simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents:
58354
diff
changeset
|
192 extra-test-exclusive) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
193 "Test if BUFFER is a `next-error' capable buffer. |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
194 |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
195 If AVOID-CURRENT is non-nil, treat the current buffer |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
196 as an absolute last resort only. |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
197 |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
198 The function EXTRA-TEST-INCLUSIVE, if non-nil, is called in each buffer |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
199 that normally would not qualify. If it returns t, the buffer |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
200 in question is treated as usable. |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
201 |
67777
8eda669e2619
(get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents:
67621
diff
changeset
|
202 The function EXTRA-TEST-EXCLUSIVE, if non-nil, is called in each buffer |
63592
153f4469d91a
(next-error-buffer-p, next-error-find-buffer): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
63487
diff
changeset
|
203 that would normally be considered usable. If it returns nil, |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
204 that buffer is rejected." |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
205 (and (buffer-name buffer) ;First make sure it's live. |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
206 (not (and avoid-current (eq buffer (current-buffer)))) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
207 (with-current-buffer buffer |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
208 (if next-error-function ; This is the normal test. |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
209 ;; Optionally reject some buffers. |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
210 (if extra-test-exclusive |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
211 (funcall extra-test-exclusive) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
212 t) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
213 ;; Optionally accept some other buffers. |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
214 (and extra-test-inclusive |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
215 (funcall extra-test-inclusive)))))) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
216 |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
217 (defun next-error-find-buffer (&optional avoid-current |
58951
c7ebd794182b
(next-error-buffer-p, next-error-find-buffer): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
58917
diff
changeset
|
218 extra-test-inclusive |
58625
31d0b9422d7b
simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents:
58354
diff
changeset
|
219 extra-test-exclusive) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
220 "Return a `next-error' capable buffer. |
67777
8eda669e2619
(get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents:
67621
diff
changeset
|
221 |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
222 If AVOID-CURRENT is non-nil, treat the current buffer |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
223 as an absolute last resort only. |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
224 |
63592
153f4469d91a
(next-error-buffer-p, next-error-find-buffer): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
63487
diff
changeset
|
225 The function EXTRA-TEST-INCLUSIVE, if non-nil, is called in each buffer |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
226 that normally would not qualify. If it returns t, the buffer |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
227 in question is treated as usable. |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
228 |
67777
8eda669e2619
(get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents:
67621
diff
changeset
|
229 The function EXTRA-TEST-EXCLUSIVE, if non-nil, is called in each buffer |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
230 that would normally be considered usable. If it returns nil, |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
231 that buffer is rejected." |
56862
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
232 (or |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
233 ;; 1. If one window on the selected frame displays such buffer, return it. |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
234 (let ((window-buffers |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
235 (delete-dups |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
236 (delq nil (mapcar (lambda (w) |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
237 (if (next-error-buffer-p |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
238 (window-buffer w) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
239 avoid-current |
58951
c7ebd794182b
(next-error-buffer-p, next-error-find-buffer): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
58917
diff
changeset
|
240 extra-test-inclusive extra-test-exclusive) |
56862
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
241 (window-buffer w))) |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
242 (window-list)))))) |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
243 (if (eq (length window-buffers) 1) |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
244 (car window-buffers))) |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
245 ;; 2. If next-error-last-buffer is an acceptable buffer, use that. |
56862
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
246 (if (and next-error-last-buffer |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
247 (next-error-buffer-p next-error-last-buffer avoid-current |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
248 extra-test-inclusive extra-test-exclusive)) |
56862
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
249 next-error-last-buffer) |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
250 ;; 3. If the current buffer is acceptable, choose it. |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
251 (if (next-error-buffer-p (current-buffer) avoid-current |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
252 extra-test-inclusive extra-test-exclusive) |
56862
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
253 (current-buffer)) |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
254 ;; 4. Look for any acceptable buffer. |
56862
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
255 (let ((buffers (buffer-list))) |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
256 (while (and buffers |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
257 (not (next-error-buffer-p |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
258 (car buffers) avoid-current |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
259 extra-test-inclusive extra-test-exclusive))) |
56862
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
260 (setq buffers (cdr buffers))) |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
261 (car buffers)) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
262 ;; 5. Use the current buffer as a last resort if it qualifies, |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
263 ;; even despite AVOID-CURRENT. |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
264 (and avoid-current |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
265 (next-error-buffer-p (current-buffer) nil |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
266 extra-test-inclusive extra-test-exclusive) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
267 (progn |
74283
2ba390dee911
(next-error-find-buffer): Improve messages.
Richard M. Stallman <rms@gnu.org>
parents:
73605
diff
changeset
|
268 (message "This is the only buffer with error message locations") |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
269 (current-buffer))) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
270 ;; 6. Give up. |
74283
2ba390dee911
(next-error-find-buffer): Improve messages.
Richard M. Stallman <rms@gnu.org>
parents:
73605
diff
changeset
|
271 (error "No buffers contain error message locations"))) |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
272 |
56861
2e59d9187762
(next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents:
56761
diff
changeset
|
273 (defun next-error (&optional arg reset) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
274 "Visit next `next-error' message and corresponding source code. |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
275 |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
276 If all the error messages parsed so far have been processed already, |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
277 the message buffer is checked for new ones. |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
278 |
55087
6831f7668364
(next-error): Change arg name. Add support for the documented C-u C-x ` usage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55066
diff
changeset
|
279 A prefix ARG specifies how many error messages to move; |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
280 negative means move back to previous error messages. |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
281 Just \\[universal-argument] as a prefix means reparse the error message buffer |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
282 and start at the first error. |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
283 |
55425
1acbf23561f5
(next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55294
diff
changeset
|
284 The RESET argument specifies that we should restart from the beginning. |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
285 |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
286 \\[next-error] normally uses the most recently started |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
287 compilation, grep, or occur buffer. It can also operate on any |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
288 buffer with output from the \\[compile], \\[grep] commands, or, |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
289 more generally, on any buffer in Compilation mode or with |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
290 Compilation Minor mode enabled, or any buffer in which |
56862
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
291 `next-error-function' is bound to an appropriate function. |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
292 To specify use of a particular buffer for error messages, type |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
293 \\[next-error] in that buffer when it is the only one displayed |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
294 in the current frame. |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
295 |
64195
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
296 Once \\[next-error] has chosen the buffer for error messages, it |
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
297 runs `next-error-hook' with `run-hooks', and stays with that buffer |
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
298 until you use it in some other buffer which uses Compilation mode |
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
299 or Compilation Minor mode. |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
300 |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
301 See variables `compilation-parse-errors-function' and |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
302 \`compilation-error-regexp-alist' for customization ideas." |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
303 (interactive "P") |
55087
6831f7668364
(next-error): Change arg name. Add support for the documented C-u C-x ` usage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55066
diff
changeset
|
304 (if (consp arg) (setq reset t arg nil)) |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
305 (when (setq next-error-last-buffer (next-error-find-buffer)) |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
306 ;; we know here that next-error-function is a valid symbol we can funcall |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
307 (with-current-buffer next-error-last-buffer |
64195
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
308 (funcall next-error-function (prefix-numeric-value arg) reset) |
81551
a39eb4ca5597
(next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
77750
diff
changeset
|
309 (when next-error-recenter |
a39eb4ca5597
(next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
77750
diff
changeset
|
310 (recenter next-error-recenter)) |
64195
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
311 (run-hooks 'next-error-hook)))) |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
312 |
65782
d88ec92a0f15
(next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents:
65698
diff
changeset
|
313 (defun next-error-internal () |
d88ec92a0f15
(next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents:
65698
diff
changeset
|
314 "Visit the source code corresponding to the `next-error' message at point." |
d88ec92a0f15
(next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents:
65698
diff
changeset
|
315 (setq next-error-last-buffer (current-buffer)) |
d88ec92a0f15
(next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents:
65698
diff
changeset
|
316 ;; we know here that next-error-function is a valid symbol we can funcall |
d88ec92a0f15
(next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents:
65698
diff
changeset
|
317 (with-current-buffer next-error-last-buffer |
d88ec92a0f15
(next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents:
65698
diff
changeset
|
318 (funcall next-error-function 0 nil) |
81551
a39eb4ca5597
(next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
77750
diff
changeset
|
319 (when next-error-recenter |
a39eb4ca5597
(next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
77750
diff
changeset
|
320 (recenter next-error-recenter)) |
65782
d88ec92a0f15
(next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents:
65698
diff
changeset
|
321 (run-hooks 'next-error-hook))) |
d88ec92a0f15
(next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents:
65698
diff
changeset
|
322 |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
323 (defalias 'goto-next-locus 'next-error) |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
324 (defalias 'next-match 'next-error) |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
325 |
56861
2e59d9187762
(next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents:
56761
diff
changeset
|
326 (defun previous-error (&optional n) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
327 "Visit previous `next-error' message and corresponding source code. |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
328 |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
329 Prefix arg N says how many error messages to move backwards (or |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
330 forwards, if negative). |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
331 |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
332 This operates on the output from the \\[compile] and \\[grep] commands." |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
333 (interactive "p") |
56861
2e59d9187762
(next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents:
56761
diff
changeset
|
334 (next-error (- (or n 1)))) |
2e59d9187762
(next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents:
56761
diff
changeset
|
335 |
2e59d9187762
(next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents:
56761
diff
changeset
|
336 (defun first-error (&optional n) |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
337 "Restart at the first error. |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
338 Visit corresponding source code. |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
339 With prefix arg N, visit the source code of the Nth error. |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
340 This operates on the output from the \\[compile] command, for instance." |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
341 (interactive "p") |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
342 (next-error n t)) |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
343 |
56861
2e59d9187762
(next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents:
56761
diff
changeset
|
344 (defun next-error-no-select (&optional n) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
345 "Move point to the next error in the `next-error' buffer and highlight match. |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
346 Prefix arg N says how many error messages to move forwards (or |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
347 backwards, if negative). |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
348 Finds and highlights the source line like \\[next-error], but does not |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
349 select the source buffer." |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
350 (interactive "p") |
56863
c8bb5aca0581
* simple.el (next-error): New defgroup and defface.
Juri Linkov <juri@jurta.org>
parents:
56862
diff
changeset
|
351 (let ((next-error-highlight next-error-highlight-no-select)) |
c8bb5aca0581
* simple.el (next-error): New defgroup and defface.
Juri Linkov <juri@jurta.org>
parents:
56862
diff
changeset
|
352 (next-error n)) |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
353 (pop-to-buffer next-error-last-buffer)) |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
354 |
56861
2e59d9187762
(next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents:
56761
diff
changeset
|
355 (defun previous-error-no-select (&optional n) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
356 "Move point to the previous error in the `next-error' buffer and highlight match. |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
357 Prefix arg N says how many error messages to move backwards (or |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
358 forwards, if negative). |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
359 Finds and highlights the source line like \\[previous-error], but does not |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
360 select the source buffer." |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
361 (interactive "p") |
56861
2e59d9187762
(next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents:
56761
diff
changeset
|
362 (next-error-no-select (- (or n 1)))) |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
363 |
56918
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
364 ;;; Internal variable for `next-error-follow-mode-post-command-hook'. |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
365 (defvar next-error-follow-last-line nil) |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
366 |
56926 | 367 (define-minor-mode next-error-follow-minor-mode |
56918
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
368 "Minor mode for compilation, occur and diff modes. |
56926 | 369 When turned on, cursor motion in the compilation, grep, occur or diff |
370 buffer causes automatic display of the corresponding source code | |
371 location." | |
64991
942d4ce7c22d
(next-error-follow-minor-mode): Fix init value and
Dan Nicolaescu <dann@ics.uci.edu>
parents:
64911
diff
changeset
|
372 :group 'next-error :init-value nil :lighter " Fol" |
56943
e57b96a4469e
(next-error-follow-minor-mode): Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents:
56926
diff
changeset
|
373 (if (not next-error-follow-minor-mode) |
56918
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
374 (remove-hook 'post-command-hook 'next-error-follow-mode-post-command-hook t) |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
375 (add-hook 'post-command-hook 'next-error-follow-mode-post-command-hook nil t) |
64685
9c89284fc434
(next-error-follow-minor-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
64598
diff
changeset
|
376 (make-local-variable 'next-error-follow-last-line))) |
56918
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
377 |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
378 ;;; Used as a `post-command-hook' by `next-error-follow-mode' |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
379 ;;; for the *Compilation* *grep* and *Occur* buffers. |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
380 (defun next-error-follow-mode-post-command-hook () |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
381 (unless (equal next-error-follow-last-line (line-number-at-pos)) |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
382 (setq next-error-follow-last-line (line-number-at-pos)) |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
383 (condition-case nil |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
384 (let ((compilation-context-lines nil)) |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
385 (setq compilation-current-error (point)) |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
386 (next-error-no-select 0)) |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
387 (error t)))) |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
388 |
56863
c8bb5aca0581
* simple.el (next-error): New defgroup and defface.
Juri Linkov <juri@jurta.org>
parents:
56862
diff
changeset
|
389 |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
390 ;;; |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
391 |
25292 | 392 (defun fundamental-mode () |
393 "Major mode not specialized for anything in particular. | |
75736
e4e80762e207
Revert previous change, at request of RMS:
Karl Fogel <kfogel@red-bean.com>
parents:
75723
diff
changeset
|
394 Other major modes are defined by comparison with this one." |
25292 | 395 (interactive) |
57146
942b8e28d21a
(fundamental-mode): Run `after-change-major-mode-hook'.
Luc Teirlinck <teirllm@auburn.edu>
parents:
57069
diff
changeset
|
396 (kill-all-local-variables) |
75736
e4e80762e207
Revert previous change, at request of RMS:
Karl Fogel <kfogel@red-bean.com>
parents:
75723
diff
changeset
|
397 (unless delay-mode-hooks |
e4e80762e207
Revert previous change, at request of RMS:
Karl Fogel <kfogel@red-bean.com>
parents:
75723
diff
changeset
|
398 (run-hooks 'after-change-major-mode-hook))) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
399 |
96124
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
400 ;; Special major modes to view specially formatted data rather than files. |
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
401 |
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
402 (defvar special-mode-map |
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
403 (let ((map (make-sparse-keymap))) |
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
404 (suppress-keymap map) |
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
405 (define-key map "q" 'quit-window) |
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
406 (define-key map " " 'scroll-up) |
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
407 (define-key map "\C-?" 'scroll-down) |
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
408 (define-key map "?" 'describe-mode) |
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
409 (define-key map ">" 'end-of-buffer) |
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
410 (define-key map "<" 'beginning-of-buffer) |
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
411 (define-key map "g" 'revert-buffer) |
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
412 map)) |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
413 |
96124
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
414 (put 'special-mode 'mode-class 'special) |
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
415 (define-derived-mode special-mode nil "Special" |
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
416 "Parent major mode from which special major modes should inherit." |
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
417 (setq buffer-read-only t)) |
48b2db6b4c28
(special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
95526
diff
changeset
|
418 |
25292 | 419 ;; Making and deleting lines. |
420 | |
66965
1bca10e9d192
* simple.el (hard-newline): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66950
diff
changeset
|
421 (defvar hard-newline (propertize "\n" 'hard t 'rear-nonsticky '(hard))) |
1bca10e9d192
* simple.el (hard-newline): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66950
diff
changeset
|
422 |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
423 (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
|
424 "Insert a newline, and move to left margin of the new line if it's blank. |
42128 | 425 If `use-hard-newlines' is non-nil, the newline is marked with the |
426 text-property `hard'. | |
31978
3a5e22f4cd99
(read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31573
diff
changeset
|
427 With ARG, insert that many newlines. |
42128 | 428 Call `auto-fill-function' if the current column number is greater |
50870
d36119648467
(newline): Don't quote nil and t in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
50685
diff
changeset
|
429 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
|
430 (interactive "*P") |
13137
a83a1515fd9b
(newline): Call barf-if-buffer-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
12975
diff
changeset
|
431 (barf-if-buffer-read-only) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
432 ;; 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
|
433 ;; 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
|
434 ;; 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
|
435 ;; the end of the previous line. |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
436 (let ((flag (and (not (bobp)) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
437 (bolp) |
17214
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
438 ;; 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
|
439 ;; 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
|
440 (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
|
441 (not before-change-functions) |
16417
fb6785d0c256
(newline): Use buffer-has-markers-at.
Richard M. Stallman <rms@gnu.org>
parents:
16408
diff
changeset
|
442 ;; Make sure there are no markers here. |
fb6785d0c256
(newline): Use buffer-has-markers-at.
Richard M. Stallman <rms@gnu.org>
parents:
16408
diff
changeset
|
443 (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
|
444 (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
|
445 ;; 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
|
446 ;; 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
|
447 (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
|
448 (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
|
449 (or (eobp) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
450 (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
|
451 ;; 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
|
452 (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
|
453 ;; 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
|
454 (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
|
455 ;; 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
|
456 (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
|
457 ;; 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
|
458 ;; 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
|
459 (< (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
|
460 (- (point) 2)))) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
461 (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
|
462 (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
|
463 (beforepos (point))) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
464 (if flag (backward-char 1)) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
465 ;; Call self-insert so that auto-fill, abbrev expansion etc. happens. |
101010
4efc7ca085ce
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
466 ;; Set last-command-event to tell self-insert what to insert. |
4efc7ca085ce
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
467 (let ((last-command-event ?\n) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
468 ;; 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
|
469 ;; 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
|
470 ;; 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
|
471 (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
|
472 (unwind-protect |
9e7727cdbb68
(newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents:
12355
diff
changeset
|
473 (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
|
474 ;; 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
|
475 (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
|
476 ;; 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
|
477 ;; 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
|
478 ;; thinks he inserted. |
b787b88cc575
(newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents:
21222
diff
changeset
|
479 |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
480 ;; Mark the newline(s) `hard'. |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
481 (if use-hard-newlines |
21459
b787b88cc575
(newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents:
21222
diff
changeset
|
482 (set-hard-newline-properties |
84609
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
483 (- (point) (prefix-numeric-value arg)) (point))) |
11324
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
484 ;; 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
|
485 ;; 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
|
486 (or flag |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
487 (save-excursion |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
488 (goto-char beforepos) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
489 (beginning-of-line) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
490 (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
|
491 (> (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
|
492 (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
|
493 ;; 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
|
494 ;; 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
|
495 ;; 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
|
496 (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
|
497 (move-to-left-margin nil t))) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
498 nil) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
499 |
16018
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
500 (defun set-hard-newline-properties (from to) |
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
501 (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
|
502 (put-text-property from to 'hard 't) |
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
503 ;; 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
|
504 (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
|
505 (put-text-property from (point) 'rear-nonsticky |
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
506 (cons 'hard sticky))))) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
507 |
55425
1acbf23561f5
(next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55294
diff
changeset
|
508 (defun open-line (n) |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
509 "Insert a newline and leave point before it. |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
510 If there is a fill prefix and/or a `left-margin', insert them |
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
511 on the new line if the line would have been blank. |
1063
25b929c06f83
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1039
diff
changeset
|
512 With arg N, insert N newlines." |
475 | 513 (interactive "*p") |
1063
25b929c06f83
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1039
diff
changeset
|
514 (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
|
515 (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
|
516 (loc (point)) |
e334380bbb2c
(next-line): Don't let `newline' expand abbrevs.
Gerd Moellmann <gerd@gnu.org>
parents:
35346
diff
changeset
|
517 ;; 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
|
518 (abbrev-mode nil)) |
55425
1acbf23561f5
(next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55294
diff
changeset
|
519 (newline n) |
11324
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
520 (goto-char loc) |
55425
1acbf23561f5
(next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55294
diff
changeset
|
521 (while (> n 0) |
11324
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
522 (cond ((bolp) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
523 (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
|
524 (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
|
525 (forward-line 1) |
55425
1acbf23561f5
(next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55294
diff
changeset
|
526 (setq n (1- n))) |
11324
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
527 (goto-char loc) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
528 (end-of-line))) |
475 | 529 |
49032
5dbb47300a5b
(split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents:
48984
diff
changeset
|
530 (defun split-line (&optional arg) |
5dbb47300a5b
(split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents:
48984
diff
changeset
|
531 "Split current line, moving portion beyond point vertically down. |
5dbb47300a5b
(split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents:
48984
diff
changeset
|
532 If the current line starts with `fill-prefix', insert it on the new |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
533 line as well. With prefix ARG, don't insert `fill-prefix' on new line. |
55425
1acbf23561f5
(next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55294
diff
changeset
|
534 |
1acbf23561f5
(next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55294
diff
changeset
|
535 When called from Lisp code, ARG may be a prefix string to copy." |
49032
5dbb47300a5b
(split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents:
48984
diff
changeset
|
536 (interactive "*P") |
475 | 537 (skip-chars-forward " \t") |
49066
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
538 (let* ((col (current-column)) |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
539 (pos (point)) |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
540 ;; What prefix should we check for (nil means don't). |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
541 (prefix (cond ((stringp arg) arg) |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
542 (arg nil) |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
543 (t fill-prefix))) |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
544 ;; Does this line start with it? |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
545 (have-prfx (and prefix |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
546 (save-excursion |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
547 (beginning-of-line) |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
548 (looking-at (regexp-quote prefix)))))) |
10422
3c447e2caef3
(open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents:
10352
diff
changeset
|
549 (newline 1) |
49066
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
550 (if have-prfx (insert-and-inherit prefix)) |
475 | 551 (indent-to col 0) |
552 (goto-char pos))) | |
553 | |
554 (defun delete-indentation (&optional arg) | |
555 "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
|
556 If there is a fill prefix, delete it from the beginning of this line. |
475 | 557 With argument, join this line to following line." |
558 (interactive "*P") | |
559 (beginning-of-line) | |
560 (if arg (forward-line 1)) | |
561 (if (eq (preceding-char) ?\n) | |
562 (progn | |
563 (delete-region (point) (1- (point))) | |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
564 ;; If the second line started with the fill prefix, |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
565 ;; delete the prefix. |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
566 (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
|
567 (<= (+ (point) (length fill-prefix)) (point-max)) |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
568 (string= fill-prefix |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
569 (buffer-substring (point) |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
570 (+ (point) (length fill-prefix))))) |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
571 (delete-region (point) (+ (point) (length fill-prefix)))) |
475 | 572 (fixup-whitespace)))) |
573 | |
24078 | 574 (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
|
575 |
475 | 576 (defun delete-blank-lines () |
577 "On blank line, delete all surrounding blank lines, leaving just one. | |
578 On isolated blank line, delete that one. | |
7817
d729f75fff04
(delete-blank-lines): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7762
diff
changeset
|
579 On nonblank line, delete any immediately following blank lines." |
475 | 580 (interactive "*") |
581 (let (thisblank singleblank) | |
582 (save-excursion | |
583 (beginning-of-line) | |
584 (setq thisblank (looking-at "[ \t]*$")) | |
715 | 585 ;; Set singleblank if there is just one blank line here. |
475 | 586 (setq singleblank |
587 (and thisblank | |
588 (not (looking-at "[ \t]*\n[ \t]*$")) | |
589 (or (bobp) | |
590 (progn (forward-line -1) | |
591 (not (looking-at "[ \t]*$"))))))) | |
715 | 592 ;; Delete preceding blank lines, and this one too if it's the only one. |
475 | 593 (if thisblank |
594 (progn | |
595 (beginning-of-line) | |
596 (if singleblank (forward-line 1)) | |
597 (delete-region (point) | |
598 (if (re-search-backward "[^ \t\n]" nil t) | |
599 (progn (forward-line 1) (point)) | |
600 (point-min))))) | |
715 | 601 ;; Delete following blank lines, unless the current line is blank |
602 ;; and there are no following blank lines. | |
475 | 603 (if (not (and thisblank singleblank)) |
604 (save-excursion | |
605 (end-of-line) | |
606 (forward-line 1) | |
607 (delete-region (point) | |
608 (if (re-search-forward "[^ \t\n]" nil t) | |
609 (progn (beginning-of-line) (point)) | |
715 | 610 (point-max))))) |
611 ;; Handle the special case where point is followed by newline and eob. | |
612 ;; Delete the line, leaving point at eob. | |
613 (if (looking-at "^[ \t]*\n\\'") | |
614 (delete-region (point) (point-max))))) | |
475 | 615 |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
616 (defun delete-trailing-whitespace () |
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
617 "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
|
618 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
|
619 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
|
620 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
|
621 (interactive "*") |
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
622 (save-match-data |
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
623 (save-excursion |
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
624 (goto-char (point-min)) |
34141
799f637fbc35
(delete-trailing-whitespace): Don't delete newlines too.
Miles Bader <miles@gnu.org>
parents:
34101
diff
changeset
|
625 (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
|
626 (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
|
627 ;; 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
|
628 (save-match-data |
08dafe901c44
(delete-trailing-whitespace): Save match data
Gerd Moellmann <gerd@gnu.org>
parents:
38432
diff
changeset
|
629 (if (looking-at ".*\f") |
08dafe901c44
(delete-trailing-whitespace): Save match data
Gerd Moellmann <gerd@gnu.org>
parents:
38432
diff
changeset
|
630 (goto-char (match-end 0)))) |
34619
237139766bdc
(delete-trailing-whitespace): Remove extraneous let.
Miles Bader <miles@gnu.org>
parents:
34570
diff
changeset
|
631 (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
|
632 |
475 | 633 (defun newline-and-indent () |
634 "Insert a newline, then indent according to major mode. | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
635 Indentation is done using the value of `indent-line-function'. |
475 | 636 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
|
637 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
|
638 column specified by the function `current-left-margin'." |
475 | 639 (interactive "*") |
34462
6a7373de926f
(delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents:
34443
diff
changeset
|
640 (delete-horizontal-space t) |
617 | 641 (newline) |
475 | 642 (indent-according-to-mode)) |
643 | |
644 (defun reindent-then-newline-and-indent () | |
645 "Reindent current line, insert newline, then indent the new line. | |
646 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
|
647 which means calling the current value of `indent-line-function'. |
475 | 648 In programming language modes, this is the same as TAB. |
649 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
|
650 column specified by the function `current-left-margin'." |
475 | 651 (interactive "*") |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
652 (let ((pos (point))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
653 ;; 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
|
654 ;; 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
|
655 (newline) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
656 (save-excursion |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
657 (goto-char pos) |
85602
9a8400cb685c
(reindent-then-newline-and-indent): Use a `move after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85514
diff
changeset
|
658 ;; We are at EOL before the call to indent-according-to-mode, and |
9a8400cb685c
(reindent-then-newline-and-indent): Use a `move after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85514
diff
changeset
|
659 ;; after it we usually are as well, but not always. We tried to |
9a8400cb685c
(reindent-then-newline-and-indent): Use a `move after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85514
diff
changeset
|
660 ;; address it with `save-excursion' but that uses a normal marker |
9a8400cb685c
(reindent-then-newline-and-indent): Use a `move after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85514
diff
changeset
|
661 ;; whereas we need `move after insertion', so we do the save/restore |
9a8400cb685c
(reindent-then-newline-and-indent): Use a `move after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85514
diff
changeset
|
662 ;; by hand. |
9a8400cb685c
(reindent-then-newline-and-indent): Use a `move after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85514
diff
changeset
|
663 (setq pos (copy-marker pos t)) |
52944
ae9d36444079
(reindent-then-newline-and-indent): Delete space *after*
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52566
diff
changeset
|
664 (indent-according-to-mode) |
85602
9a8400cb685c
(reindent-then-newline-and-indent): Use a `move after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85514
diff
changeset
|
665 (goto-char pos) |
9a8400cb685c
(reindent-then-newline-and-indent): Use a `move after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85514
diff
changeset
|
666 ;; Remove the trailing white-space after indentation because |
9a8400cb685c
(reindent-then-newline-and-indent): Use a `move after
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85514
diff
changeset
|
667 ;; indentation may introduce the whitespace. |
52944
ae9d36444079
(reindent-then-newline-and-indent): Delete space *after*
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52566
diff
changeset
|
668 (delete-horizontal-space t)) |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
669 (indent-according-to-mode))) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
670 |
25292 | 671 (defun quoted-insert (arg) |
672 "Read next input character and insert it. | |
673 This is useful for inserting control characters. | |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
674 With argument, insert ARG copies of the character. |
25292 | 675 |
676 If the first character you type after this command is an octal digit, | |
677 you should type a sequence of octal digits which specify a character code. | |
678 Any nondigit terminates the sequence. If the terminator is a RET, | |
679 it is discarded; any other terminator is used itself as input. | |
680 The variable `read-quoted-char-radix' specifies the radix for this feature; | |
681 set it to 10 or 16 to use decimal or hex instead of octal. | |
682 | |
683 In overwrite mode, this function inserts the character anyway, and | |
684 does not handle octal digits specially. This means that if you use | |
685 overwrite as your normal editing mode, you can use this function to | |
686 insert characters when necessary. | |
687 | |
688 In binary overwrite mode, this function does overwrite, and octal | |
689 digits are interpreted as a character code. This is intended to be | |
690 useful for editing binary files." | |
691 (interactive "*p") | |
102031
7a9e5d67e102
(quoted-insert, zap-to-char): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents:
101897
diff
changeset
|
692 (let* ((char |
7a9e5d67e102
(quoted-insert, zap-to-char): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents:
101897
diff
changeset
|
693 ;; Avoid "obsolete" warnings for translation-table-for-input. |
7a9e5d67e102
(quoted-insert, zap-to-char): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents:
101897
diff
changeset
|
694 (with-no-warnings |
7a9e5d67e102
(quoted-insert, zap-to-char): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents:
101897
diff
changeset
|
695 (let (translation-table-for-input input-method-function) |
7a9e5d67e102
(quoted-insert, zap-to-char): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents:
101897
diff
changeset
|
696 (if (or (not overwrite-mode) |
7a9e5d67e102
(quoted-insert, zap-to-char): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents:
101897
diff
changeset
|
697 (eq overwrite-mode 'overwrite-mode-binary)) |
7a9e5d67e102
(quoted-insert, zap-to-char): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents:
101897
diff
changeset
|
698 (read-quoted-char) |
7a9e5d67e102
(quoted-insert, zap-to-char): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents:
101897
diff
changeset
|
699 (read-char)))))) |
97128
716070916653
(quoted-insert): Comment out code that treats 0240-0377 specially.
Juri Linkov <juri@jurta.org>
parents:
97043
diff
changeset
|
700 ;; This used to assume character codes 0240 - 0377 stand for |
716070916653
(quoted-insert): Comment out code that treats 0240-0377 specially.
Juri Linkov <juri@jurta.org>
parents:
97043
diff
changeset
|
701 ;; characters in some single-byte character set, and converted them |
716070916653
(quoted-insert): Comment out code that treats 0240-0377 specially.
Juri Linkov <juri@jurta.org>
parents:
97043
diff
changeset
|
702 ;; to Emacs characters. But in 23.1 this feature is deprecated |
716070916653
(quoted-insert): Comment out code that treats 0240-0377 specially.
Juri Linkov <juri@jurta.org>
parents:
97043
diff
changeset
|
703 ;; in favor of inserting the corresponding Unicode characters. |
716070916653
(quoted-insert): Comment out code that treats 0240-0377 specially.
Juri Linkov <juri@jurta.org>
parents:
97043
diff
changeset
|
704 ;; (if (and enable-multibyte-characters |
716070916653
(quoted-insert): Comment out code that treats 0240-0377 specially.
Juri Linkov <juri@jurta.org>
parents:
97043
diff
changeset
|
705 ;; (>= char ?\240) |
716070916653
(quoted-insert): Comment out code that treats 0240-0377 specially.
Juri Linkov <juri@jurta.org>
parents:
97043
diff
changeset
|
706 ;; (<= char ?\377)) |
716070916653
(quoted-insert): Comment out code that treats 0240-0377 specially.
Juri Linkov <juri@jurta.org>
parents:
97043
diff
changeset
|
707 ;; (setq char (unibyte-char-to-multibyte char))) |
25292 | 708 (if (> arg 0) |
709 (if (eq overwrite-mode 'overwrite-mode-binary) | |
710 (delete-char arg))) | |
711 (while (> arg 0) | |
712 (insert-and-inherit char) | |
713 (setq arg (1- arg))))) | |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
714 |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
715 (defun forward-to-indentation (&optional arg) |
25292 | 716 "Move forward ARG lines and position at first nonblank character." |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
717 (interactive "^p") |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
718 (forward-line (or arg 1)) |
25292 | 719 (skip-chars-forward " \t")) |
720 | |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
721 (defun backward-to-indentation (&optional arg) |
25292 | 722 "Move backward ARG lines and position at first nonblank character." |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
723 (interactive "^p") |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
724 (forward-line (- (or arg 1))) |
25292 | 725 (skip-chars-forward " \t")) |
726 | |
727 (defun back-to-indentation () | |
728 "Move point to the first non-whitespace character on this line." | |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
729 (interactive "^") |
25292 | 730 (beginning-of-line 1) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
731 (skip-syntax-forward " " (line-end-position)) |
50685
ee0efd6ecb89
(back-to-indentation): Call backward-prefix-chars.
Richard M. Stallman <rms@gnu.org>
parents:
50652
diff
changeset
|
732 ;; Move back over chars that have whitespace syntax but have the p flag. |
ee0efd6ecb89
(back-to-indentation): Call backward-prefix-chars.
Richard M. Stallman <rms@gnu.org>
parents:
50652
diff
changeset
|
733 (backward-prefix-chars)) |
25292 | 734 |
735 (defun fixup-whitespace () | |
736 "Fixup white space between objects around point. | |
737 Leave one space or none, according to the context." | |
738 (interactive "*") | |
739 (save-excursion | |
740 (delete-horizontal-space) | |
741 (if (or (looking-at "^\\|\\s)") | |
742 (save-excursion (forward-char -1) | |
743 (looking-at "$\\|\\s(\\|\\s'"))) | |
744 nil | |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
745 (insert ?\s)))) |
25292 | 746 |
34462
6a7373de926f
(delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents:
34443
diff
changeset
|
747 (defun delete-horizontal-space (&optional backward-only) |
6a7373de926f
(delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents:
34443
diff
changeset
|
748 "Delete all spaces and tabs around point. |
74848
75360a225c60
(delete-horizontal-space): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
74701
diff
changeset
|
749 If BACKWARD-ONLY is non-nil, only delete them before point." |
74701
14b7babc6a00
(delete-horizontal-space): Use prefix arg.
Richard M. Stallman <rms@gnu.org>
parents:
74392
diff
changeset
|
750 (interactive "*P") |
37791
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
751 (let ((orig-pos (point))) |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
752 (delete-region |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
753 (if backward-only |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
754 orig-pos |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
755 (progn |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
756 (skip-chars-forward " \t") |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
757 (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
|
758 (progn |
37791
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
759 (skip-chars-backward " \t") |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
760 (constrain-to-field nil orig-pos))))) |
25292 | 761 |
59598
9782a4d3aef5
(just-one-space): Make arg optional.
Kim F. Storm <storm@cua.dk>
parents:
59567
diff
changeset
|
762 (defun just-one-space (&optional n) |
59567
638fd0a9f545
(just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents:
59486
diff
changeset
|
763 "Delete all spaces and tabs around point, leaving one space (or N spaces)." |
638fd0a9f545
(just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents:
59486
diff
changeset
|
764 (interactive "*p") |
37791
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
765 (let ((orig-pos (point))) |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
766 (skip-chars-backward " \t") |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
767 (constrain-to-field nil orig-pos) |
59598
9782a4d3aef5
(just-one-space): Make arg optional.
Kim F. Storm <storm@cua.dk>
parents:
59567
diff
changeset
|
768 (dotimes (i (or n 1)) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
769 (if (= (following-char) ?\s) |
59567
638fd0a9f545
(just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents:
59486
diff
changeset
|
770 (forward-char 1) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
771 (insert ?\s))) |
37791
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
772 (delete-region |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
773 (point) |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
774 (progn |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
775 (skip-chars-forward " \t") |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
776 (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
|
777 |
475 | 778 (defun beginning-of-buffer (&optional arg) |
779 "Move point to the beginning of the buffer; leave mark at previous position. | |
56432
af62749c9497
(inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
56378
diff
changeset
|
780 With \\[universal-argument] prefix, do not set mark at previous position. |
af62749c9497
(inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
56378
diff
changeset
|
781 With numeric arg N, put point N/10 of the way from the beginning. |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
782 |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
783 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
|
784 of the accessible part of the buffer. |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
785 |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
786 Don't use this command in Lisp programs! |
475 | 787 \(goto-char (point-min)) is faster and avoids clobbering the mark." |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
788 (interactive "^P") |
58961
2a281af9d3ad
(inhibit-mark-movement): Remove defvar.
Kim F. Storm <storm@cua.dk>
parents:
58951
diff
changeset
|
789 (or (consp arg) |
93561
e39e5bb86d6b
(beginning-of-buffer, end-of-buffer, goto-line, undo)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93548
diff
changeset
|
790 (region-active-p) |
58917
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
791 (push-mark)) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
792 (let ((size (- (point-max) (point-min)))) |
56432
af62749c9497
(inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
56378
diff
changeset
|
793 (goto-char (if (and arg (not (consp arg))) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
794 (+ (point-min) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
795 (if (> size 10000) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
796 ;; Avoid overflow for large buffer sizes! |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
797 (* (prefix-numeric-value arg) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
798 (/ size 10)) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
799 (/ (+ 10 (* size (prefix-numeric-value arg))) 10))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
800 (point-min)))) |
76295
d84c0ae58cc7
(beginning-of-buffer, end-of-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
75995
diff
changeset
|
801 (if (and arg (not (consp arg))) (forward-line 1))) |
475 | 802 |
803 (defun end-of-buffer (&optional arg) | |
804 "Move point to the end of the buffer; leave mark at previous position. | |
56432
af62749c9497
(inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
56378
diff
changeset
|
805 With \\[universal-argument] prefix, do not set mark at previous position. |
af62749c9497
(inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
56378
diff
changeset
|
806 With numeric arg N, put point N/10 of the way from the end. |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
807 |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
808 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
|
809 of the accessible part of the buffer. |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
810 |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
811 Don't use this command in Lisp programs! |
475 | 812 \(goto-char (point-max)) is faster and avoids clobbering the mark." |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
813 (interactive "^P") |
93561
e39e5bb86d6b
(beginning-of-buffer, end-of-buffer, goto-line, undo)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93548
diff
changeset
|
814 (or (consp arg) (region-active-p) (push-mark)) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
815 (let ((size (- (point-max) (point-min)))) |
56432
af62749c9497
(inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
56378
diff
changeset
|
816 (goto-char (if (and arg (not (consp arg))) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
817 (- (point-max) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
818 (if (> size 10000) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
819 ;; Avoid overflow for large buffer sizes! |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
820 (* (prefix-numeric-value arg) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
821 (/ size 10)) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
822 (/ (* size (prefix-numeric-value arg)) 10))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
823 (point-max)))) |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
824 ;; 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
|
825 ;; adjust it to the beginning of a line. |
76295
d84c0ae58cc7
(beginning-of-buffer, end-of-buffer):
Richard M. Stallman <rms@gnu.org>
parents:
75995
diff
changeset
|
826 (cond ((and arg (not (consp arg))) (forward-line 1)) |
39743
b6933b0f1ef2
(end-of-buffer): Fix code scrolling specially
Gerd Moellmann <gerd@gnu.org>
parents:
39612
diff
changeset
|
827 ((> (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
|
828 ;; 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
|
829 ;; 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
|
830 (overlay-recenter (point)) |
bcd25953e4cf
(end-of-buffer): Use window-end to find the window end
Gerd Moellmann <gerd@gnu.org>
parents:
26201
diff
changeset
|
831 (recenter -3)))) |
475 | 832 |
833 (defun mark-whole-buffer () | |
715 | 834 "Put point at beginning and mark at end of buffer. |
835 You probably should not use this function in Lisp programs; | |
836 it is usually a mistake for a Lisp function to use any subroutine | |
837 that uses or sets the mark." | |
475 | 838 (interactive) |
839 (push-mark (point)) | |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
840 (push-mark (point-max) nil t) |
475 | 841 (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
|
842 |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
843 |
25292 | 844 ;; Counting lines, one way or another. |
845 | |
99799
3a08b596c63b
(goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents:
99654
diff
changeset
|
846 (defun goto-line (line &optional buffer) |
3a08b596c63b
(goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents:
99654
diff
changeset
|
847 "Goto LINE, counting from line 1 at beginning of buffer. |
3a08b596c63b
(goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents:
99654
diff
changeset
|
848 Normally, move point in the current buffer, and leave mark at the |
3a08b596c63b
(goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents:
99654
diff
changeset
|
849 previous position. With just \\[universal-argument] as argument, |
3a08b596c63b
(goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents:
99654
diff
changeset
|
850 move point in the most recently selected other buffer, and switch |
3a08b596c63b
(goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents:
99654
diff
changeset
|
851 to it. When called from Lisp code, the optional argument BUFFER |
3a08b596c63b
(goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents:
99654
diff
changeset
|
852 specifies a buffer to switch to. |
3a08b596c63b
(goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents:
99654
diff
changeset
|
853 |
3a08b596c63b
(goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents:
99654
diff
changeset
|
854 If there's a number in the buffer at point, it is the default for |
3a08b596c63b
(goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents:
99654
diff
changeset
|
855 LINE." |
60405
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
856 (interactive |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
857 (if (and current-prefix-arg (not (consp current-prefix-arg))) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
858 (list (prefix-numeric-value current-prefix-arg)) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
859 ;; Look for a default, a number in the buffer at point. |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
860 (let* ((default |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
861 (save-excursion |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
862 (skip-chars-backward "0-9") |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
863 (if (looking-at "[0-9]") |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
864 (buffer-substring-no-properties |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
865 (point) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
866 (progn (skip-chars-forward "0-9") |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
867 (point)))))) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
868 ;; Decide if we're switching buffers. |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
869 (buffer |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
870 (if (consp current-prefix-arg) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
871 (other-buffer (current-buffer) t))) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
872 (buffer-prompt |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
873 (if buffer |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
874 (concat " in " (buffer-name buffer)) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
875 ""))) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
876 ;; Read the argument, offering that number (if any) as default. |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
877 (list (read-from-minibuffer (format (if default "Goto line%s (%s): " |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
878 "Goto line%s: ") |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
879 buffer-prompt |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
880 default) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
881 nil nil t |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
882 'minibuffer-history |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
883 default) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
884 buffer)))) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
885 ;; Switch to the desired buffer, one way or another. |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
886 (if buffer |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
887 (let ((window (get-buffer-window buffer))) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
888 (if window (select-window window) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
889 (switch-to-buffer-other-window buffer)))) |
93011
b1cbc5b82a29
(goto-line): Leave mark at previous position. Doc fix.
Juri Linkov <juri@jurta.org>
parents:
92948
diff
changeset
|
890 ;; Leave mark at previous position |
93561
e39e5bb86d6b
(beginning-of-buffer, end-of-buffer, goto-line, undo)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93548
diff
changeset
|
891 (or (region-active-p) (push-mark)) |
60405
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
892 ;; Move to the specified line number in that buffer. |
25292 | 893 (save-restriction |
894 (widen) | |
895 (goto-char 1) | |
896 (if (eq selective-display t) | |
99799
3a08b596c63b
(goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents:
99654
diff
changeset
|
897 (re-search-forward "[\n\C-m]" nil 'end (1- line)) |
3a08b596c63b
(goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents:
99654
diff
changeset
|
898 (forward-line (1- line))))) |
475 | 899 |
900 (defun count-lines-region (start end) | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3487
diff
changeset
|
901 "Print number of lines and characters in the region." |
475 | 902 (interactive "r") |
903 (message "Region has %d lines, %d characters" | |
904 (count-lines start end) (- end start))) | |
905 | |
906 (defun what-line () | |
12939
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
907 "Print the current buffer line number and narrowed line number of point." |
475 | 908 (interactive) |
58754
b41534d7c63c
(blink-matching-open): Obey syntax-table text properties.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58625
diff
changeset
|
909 (let ((start (point-min)) |
53839
be1da5092aa4
(line-number-at-pos): Rename from line-at-pos.
Kim F. Storm <storm@cua.dk>
parents:
53767
diff
changeset
|
910 (n (line-number-at-pos))) |
53677 | 911 (if (= start 1) |
912 (message "Line %d" n) | |
913 (save-excursion | |
914 (save-restriction | |
915 (widen) | |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
916 (message "line %d (narrowed line %d)" |
53839
be1da5092aa4
(line-number-at-pos): Rename from line-at-pos.
Kim F. Storm <storm@cua.dk>
parents:
53767
diff
changeset
|
917 (+ n (line-number-at-pos start) -1) n)))))) |
12939
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
918 |
475 | 919 (defun count-lines (start end) |
920 "Return number of lines between START and END. | |
921 This is usually the number of newlines between them, | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
922 but can be one more if START is not equal to END |
475 | 923 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
|
924 (save-excursion |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
925 (save-restriction |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
926 (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
|
927 (goto-char (point-min)) |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
928 (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
|
929 (save-match-data |
2421
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
930 (let ((done 0)) |
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
931 (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
|
932 (setq done (+ 40 done))) |
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
933 (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
|
934 (setq done (+ 1 done))) |
5151
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
935 (goto-char (point-max)) |
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
936 (if (and (/= start end) |
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
937 (not (bolp))) |
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
938 (1+ done) |
9554
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
939 done))) |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
940 (- (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
|
941 |
53839
be1da5092aa4
(line-number-at-pos): Rename from line-at-pos.
Kim F. Storm <storm@cua.dk>
parents:
53767
diff
changeset
|
942 (defun line-number-at-pos (&optional pos) |
53677 | 943 "Return (narrowed) buffer line number at position POS. |
72451
66b140055b7d
(line-number-at-pos): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
72411
diff
changeset
|
944 If POS is nil, use current buffer location. |
66b140055b7d
(line-number-at-pos): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
72411
diff
changeset
|
945 Counting starts at (point-min), so the value refers |
66b140055b7d
(line-number-at-pos): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
72411
diff
changeset
|
946 to the contents of the accessible portion of the buffer." |
53677 | 947 (let ((opoint (or pos (point))) start) |
948 (save-excursion | |
949 (goto-char (point-min)) | |
950 (setq start (point)) | |
951 (goto-char opoint) | |
952 (forward-line 0) | |
953 (1+ (count-lines start (point)))))) | |
954 | |
16999
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
955 (defun what-cursor-position (&optional detail) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
956 "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
|
957 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
|
958 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
|
959 |
0f92ac490b66
* simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents:
24372
diff
changeset
|
960 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
|
961 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
|
962 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
|
963 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
|
964 byte, just \"...\" is shown. |
23963
c242e2dc93a9
(what-cursor-position): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
23944
diff
changeset
|
965 |
28896
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
966 In addition, with prefix argument, show details about that character |
45870
8da973b0df20
(what-cursor-position): Use describe-char.
Richard M. Stallman <rms@gnu.org>
parents:
45730
diff
changeset
|
967 in *Help* buffer. See also the command `describe-char'." |
16999
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
968 (interactive "P") |
475 | 969 (let* ((char (following-char)) |
970 (beg (point-min)) | |
971 (end (point-max)) | |
972 (pos (point)) | |
973 (total (buffer-size)) | |
974 (percent (if (> total 50000) | |
975 ;; Avoid overflow from multiplying by 100! | |
976 (/ (+ (/ total 200) (1- pos)) (max (/ total 100) 1)) | |
977 (/ (+ (/ total 2) (* 100 (1- pos))) (max total 1)))) | |
978 (hscroll (if (= (window-hscroll) 0) | |
979 "" | |
980 (format " Hscroll=%d" (window-hscroll)))) | |
981 (col (current-column))) | |
982 (if (= pos end) | |
983 (if (or (/= beg 1) (/= end (1+ total))) | |
67034
c6e50090a202
(what-cursor-position): Use Lisp-readable syntax for octal and hex.
Juri Linkov <juri@jurta.org>
parents:
66973
diff
changeset
|
984 (message "point=%d of %d (%d%%) <%d-%d> column=%d%s" |
475 | 985 pos total percent beg end col hscroll) |
67034
c6e50090a202
(what-cursor-position): Use Lisp-readable syntax for octal and hex.
Juri Linkov <juri@jurta.org>
parents:
66973
diff
changeset
|
986 (message "point=%d of %d (EOB) column=%d%s" |
66823
e0104334e066
(what-cursor-position): Print (EOB) instead of (100%)
Kim F. Storm <storm@cua.dk>
parents:
66671
diff
changeset
|
987 pos total col hscroll)) |
24398
0f92ac490b66
* simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents:
24372
diff
changeset
|
988 (let ((coding buffer-file-coding-system) |
65862
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
989 encoded encoding-msg display-prop under-display) |
24398
0f92ac490b66
* simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents:
24372
diff
changeset
|
990 (if (or (not coding) |
0f92ac490b66
* simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents:
24372
diff
changeset
|
991 (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
|
992 (setq coding default-buffer-file-coding-system)) |
89483 | 993 (if (eq (char-charset char) 'eight-bit) |
24508
f9e613360d62
(what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents:
24419
diff
changeset
|
994 (setq encoding-msg |
90261
7beb78bc1f8e
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
Miles Bader <miles@gnu.org>
diff
changeset
|
995 (format "(%d, #o%o, #x%x, raw-byte)" char char char)) |
65862
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
996 ;; Check if the character is displayed with some `display' |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
997 ;; text property. In that case, set under-display to the |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
998 ;; buffer substring covered by that property. |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
999 (setq display-prop (get-text-property pos 'display)) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1000 (if display-prop |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1001 (let ((to (or (next-single-property-change pos 'display) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1002 (point-max)))) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1003 (if (< to (+ pos 4)) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1004 (setq under-display "") |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1005 (setq under-display "..." |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1006 to (+ pos 4))) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1007 (setq under-display |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1008 (concat (buffer-substring-no-properties pos to) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1009 under-display))) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1010 (setq encoded (and (>= char 128) (encode-coding-char char coding)))) |
24508
f9e613360d62
(what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents:
24419
diff
changeset
|
1011 (setq encoding-msg |
65862
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1012 (if display-prop |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1013 (if (not (stringp display-prop)) |
67034
c6e50090a202
(what-cursor-position): Use Lisp-readable syntax for octal and hex.
Juri Linkov <juri@jurta.org>
parents:
66973
diff
changeset
|
1014 (format "(%d, #o%o, #x%x, part of display \"%s\")" |
65862
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1015 char char char under-display) |
67034
c6e50090a202
(what-cursor-position): Use Lisp-readable syntax for octal and hex.
Juri Linkov <juri@jurta.org>
parents:
66973
diff
changeset
|
1016 (format "(%d, #o%o, #x%x, part of display \"%s\"->\"%s\")" |
65862
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1017 char char char under-display display-prop)) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1018 (if encoded |
67034
c6e50090a202
(what-cursor-position): Use Lisp-readable syntax for octal and hex.
Juri Linkov <juri@jurta.org>
parents:
66973
diff
changeset
|
1019 (format "(%d, #o%o, #x%x, file %s)" |
65862
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1020 char char char |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1021 (if (> (length encoded) 1) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1022 "..." |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1023 (encoded-string-description encoded coding))) |
67034
c6e50090a202
(what-cursor-position): Use Lisp-readable syntax for octal and hex.
Juri Linkov <juri@jurta.org>
parents:
66973
diff
changeset
|
1024 (format "(%d, #o%o, #x%x)" char char char))))) |
23944
b5617ede97a8
(what-cursor-position): Print character encoding also.
Richard M. Stallman <rms@gnu.org>
parents:
23864
diff
changeset
|
1025 (if detail |
28896
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
1026 ;; We show the detailed information about CHAR. |
45870
8da973b0df20
(what-cursor-position): Use describe-char.
Richard M. Stallman <rms@gnu.org>
parents:
45730
diff
changeset
|
1027 (describe-char (point))) |
28896
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
1028 (if (or (/= beg 1) (/= end (1+ total))) |
67034
c6e50090a202
(what-cursor-position): Use Lisp-readable syntax for octal and hex.
Juri Linkov <juri@jurta.org>
parents:
66973
diff
changeset
|
1029 (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
|
1030 (if (< char 256) |
8063bfbd8b08
(what-cursor-position): Show "(composed)" if the
Kenichi Handa <handa@m17n.org>
parents:
26744
diff
changeset
|
1031 (single-key-description char) |
8063bfbd8b08
(what-cursor-position): Show "(composed)" if the
Kenichi Handa <handa@m17n.org>
parents:
26744
diff
changeset
|
1032 (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
|
1033 encoding-msg pos total percent beg end col hscroll) |
67034
c6e50090a202
(what-cursor-position): Use Lisp-readable syntax for octal and hex.
Juri Linkov <juri@jurta.org>
parents:
66973
diff
changeset
|
1034 (message "Char: %s %s point=%d of %d (%d%%) column=%d%s" |
65862
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1035 (if enable-multibyte-characters |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1036 (if (< char 128) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1037 (single-key-description char) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1038 (buffer-substring-no-properties (point) (1+ (point)))) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
1039 (single-key-description char)) |
28896
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
1040 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
|
1041 |
73416
d443f2b23be1
(read-expression-map): Just set it, no defvar.
Richard M. Stallman <rms@gnu.org>
parents:
73408
diff
changeset
|
1042 ;; Initialize read-expression-map. It is defined at C level. |
d443f2b23be1
(read-expression-map): Just set it, no defvar.
Richard M. Stallman <rms@gnu.org>
parents:
73408
diff
changeset
|
1043 (let ((m (make-sparse-keymap))) |
d443f2b23be1
(read-expression-map): Just set it, no defvar.
Richard M. Stallman <rms@gnu.org>
parents:
73408
diff
changeset
|
1044 (define-key m "\M-\t" 'lisp-complete-symbol) |
d443f2b23be1
(read-expression-map): Just set it, no defvar.
Richard M. Stallman <rms@gnu.org>
parents:
73408
diff
changeset
|
1045 (set-keymap-parent m minibuffer-local-map) |
d443f2b23be1
(read-expression-map): Just set it, no defvar.
Richard M. Stallman <rms@gnu.org>
parents:
73408
diff
changeset
|
1046 (setq read-expression-map m)) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1047 |
4289
4d0c57f01eed
(read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents:
4287
diff
changeset
|
1048 (defvar read-expression-history nil) |
4d0c57f01eed
(read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents:
4287
diff
changeset
|
1049 |
76386
8c1cfda1a9ec
(minibuffer-completing-symbol): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
76357
diff
changeset
|
1050 (defvar minibuffer-completing-symbol nil |
8c1cfda1a9ec
(minibuffer-completing-symbol): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
76357
diff
changeset
|
1051 "Non-nil means completing a Lisp symbol in the minibuffer.") |
8c1cfda1a9ec
(minibuffer-completing-symbol): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
76357
diff
changeset
|
1052 |
100810
8bebf3521844
(minibuffer-default): Add defvar.
Chong Yidong <cyd@stupidchicken.com>
parents:
100803
diff
changeset
|
1053 (defvar minibuffer-default nil |
8bebf3521844
(minibuffer-default): Add defvar.
Chong Yidong <cyd@stupidchicken.com>
parents:
100803
diff
changeset
|
1054 "The current default value or list of default values in the minibuffer. |
8bebf3521844
(minibuffer-default): Add defvar.
Chong Yidong <cyd@stupidchicken.com>
parents:
100803
diff
changeset
|
1055 The functions `read-from-minibuffer' and `completing-read' bind |
8bebf3521844
(minibuffer-default): Add defvar.
Chong Yidong <cyd@stupidchicken.com>
parents:
100803
diff
changeset
|
1056 this variable locally.") |
8bebf3521844
(minibuffer-default): Add defvar.
Chong Yidong <cyd@stupidchicken.com>
parents:
100803
diff
changeset
|
1057 |
25702
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1058 (defcustom eval-expression-print-level 4 |
63022
5e1ac4f79779
(eval-expression-print-level)
Luc Teirlinck <teirllm@auburn.edu>
parents:
62987
diff
changeset
|
1059 "Value for `print-level' while 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
|
1060 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
|
1061 :group 'lisp |
42128 | 1062 :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
|
1063 :version "21.1") |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1064 |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1065 (defcustom eval-expression-print-length 12 |
63022
5e1ac4f79779
(eval-expression-print-level)
Luc Teirlinck <teirllm@auburn.edu>
parents:
62987
diff
changeset
|
1066 "Value for `print-length' while 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
|
1067 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
|
1068 :group 'lisp |
42128 | 1069 :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
|
1070 :version "21.1") |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1071 |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1072 (defcustom eval-expression-debug-on-error t |
63022
5e1ac4f79779
(eval-expression-print-level)
Luc Teirlinck <teirllm@auburn.edu>
parents:
62987
diff
changeset
|
1073 "If non-nil set `debug-on-error' to t in `eval-expression'. |
27302
1cb6c18c3163
(eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents:
27298
diff
changeset
|
1074 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
|
1075 :group 'lisp |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1076 :type 'boolean |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1077 :version "21.1") |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1078 |
55799
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1079 (defun eval-expression-print-format (value) |
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1080 "Format VALUE as a result of evaluated expression. |
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1081 Return a formatted string which is displayed in the echo area |
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1082 in addition to the value printed by prin1 in functions which |
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1083 display the result of expression evaluation." |
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1084 (if (and (integerp value) |
56005
54d79ab53dd3
(eval-expression-print-format): Don't print additional
Juri Linkov <juri@jurta.org>
parents:
55975
diff
changeset
|
1085 (or (not (memq this-command '(eval-last-sexp eval-print-last-sexp))) |
55799
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1086 (eq this-command last-command) |
59567
638fd0a9f545
(just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents:
59486
diff
changeset
|
1087 (if (boundp 'edebug-active) edebug-active))) |
55799
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1088 (let ((char-string |
60007
bfdc24654127
(eval-expression-print-format): Avoid warning about edebug-active.
Richard M. Stallman <rms@gnu.org>
parents:
59996
diff
changeset
|
1089 (if (or (if (boundp 'edebug-active) edebug-active) |
84609
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
1090 (memq this-command '(eval-last-sexp eval-print-last-sexp))) |
55799
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1091 (prin1-char value)))) |
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1092 (if char-string |
66595
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
1093 (format " (#o%o, #x%x, %s)" value value char-string) |
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
1094 (format " (#o%o, #x%x)" value value))))) |
55799
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1095 |
4289
4d0c57f01eed
(read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents:
4287
diff
changeset
|
1096 ;; We define this, rather than making `eval' interactive, |
71625 | 1097 ;; for the sake of completion of names like eval-region, eval-buffer. |
19514
9f6b375ce842
(eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19362
diff
changeset
|
1098 (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
|
1099 &optional eval-expression-insert-value) |
36021 | 1100 "Evaluate EVAL-EXPRESSION-ARG and print value in the echo area. |
1101 Value is also consed on to front of the variable `values'. | |
1102 Optional argument EVAL-EXPRESSION-INSERT-VALUE, if non-nil, means | |
1103 insert the result into the current buffer instead of printing it in | |
102264
4fd9b5c566ce
(eval-expression): Mention truncation in doc.
Glenn Morris <rgm@gnu.org>
parents:
102031
diff
changeset
|
1104 the echo area. Truncates long output according to the value of the |
4fd9b5c566ce
(eval-expression): Mention truncation in doc.
Glenn Morris <rgm@gnu.org>
parents:
102031
diff
changeset
|
1105 variables `eval-expression-print-length' and `eval-expression-print-level'. |
69852
a4e59f3e040c
(eval-expression): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
69602
diff
changeset
|
1106 |
a4e59f3e040c
(eval-expression): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
69602
diff
changeset
|
1107 If `eval-expression-debug-on-error' is non-nil, which is the default, |
a4e59f3e040c
(eval-expression): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
69602
diff
changeset
|
1108 this command arranges for all errors to enter the debugger." |
4886
20e345c97e28
(eval-expression, edit-and-eval-command): Let
Brian Fox <bfox@gnu.org>
parents:
4869
diff
changeset
|
1109 (interactive |
76386
8c1cfda1a9ec
(minibuffer-completing-symbol): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
76357
diff
changeset
|
1110 (list (let ((minibuffer-completing-symbol t)) |
8c1cfda1a9ec
(minibuffer-completing-symbol): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
76357
diff
changeset
|
1111 (read-from-minibuffer "Eval: " |
8c1cfda1a9ec
(minibuffer-completing-symbol): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
76357
diff
changeset
|
1112 nil read-expression-map t |
8c1cfda1a9ec
(minibuffer-completing-symbol): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
76357
diff
changeset
|
1113 'read-expression-history)) |
19514
9f6b375ce842
(eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19362
diff
changeset
|
1114 current-prefix-arg)) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
1115 |
27302
1cb6c18c3163
(eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents:
27298
diff
changeset
|
1116 (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
|
1117 (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
|
1118 (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
|
1119 ;; 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
|
1120 ;; 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
|
1121 (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
|
1122 (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
|
1123 (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
|
1124 ;; 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
|
1125 ;; 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
|
1126 (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
|
1127 (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
|
1128 |
25702
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1129 (let ((print-length eval-expression-print-length) |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1130 (print-level eval-expression-print-level)) |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
1131 (if eval-expression-insert-value |
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
1132 (with-no-warnings |
52566
38d8d37f129a
(eval-expression): Bind standard-output in to-buffer case.
Richard M. Stallman <rms@gnu.org>
parents:
52464
diff
changeset
|
1133 (let ((standard-output (current-buffer))) |
75468
e6bf9dd8fe81
(eval-expression): Don't use eval-last-sexp-print-value
Richard M. Stallman <rms@gnu.org>
parents:
75347
diff
changeset
|
1134 (prin1 (car values)))) |
55799
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1135 (prog1 |
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1136 (prin1 (car values) t) |
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1137 (let ((str (eval-expression-print-format (car values)))) |
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1138 (if str (princ str t))))))) |
475 | 1139 |
1140 (defun edit-and-eval-command (prompt command) | |
1141 "Prompting with PROMPT, let user edit COMMAND and eval result. | |
1142 COMMAND is a Lisp expression. Let user edit that expression in | |
1143 the minibuffer, then read and evaluate the result." | |
47599
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1144 (let ((command |
53767
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1145 (let ((print-level nil) |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1146 (minibuffer-history-sexp-flag (1+ (minibuffer-depth)))) |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1147 (unwind-protect |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1148 (read-from-minibuffer prompt |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1149 (prin1-to-string command) |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1150 read-expression-map t |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1151 'command-history) |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1152 ;; If command was added to command-history as a string, |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1153 ;; get rid of that. We want only evaluable expressions there. |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1154 (if (stringp (car command-history)) |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1155 (setq command-history (cdr command-history))))))) |
9629
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
1156 |
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
1157 ;; 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
|
1158 ;; 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
|
1159 (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
|
1160 (setq command-history (cons command command-history))) |
475 | 1161 (eval command))) |
1162 | |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1163 (defun repeat-complex-command (arg) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1164 "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
|
1165 A complex command is one which used the minibuffer. |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1166 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
|
1167 The result is executed, repeating the command as changed. |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
1168 If the command has been changed or is not the most recent previous |
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
1169 command it is added to the front of the command history. |
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
1170 You can use the minibuffer history commands \ |
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
1171 \\<minibuffer-local-map>\\[next-history-element] and \\[previous-history-element] |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1172 to get different commands to edit and resubmit." |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1173 (interactive "p") |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1174 (let ((elt (nth (1- arg) command-history)) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1175 newcmd) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1176 (if elt |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1177 (progn |
4821
2c16f99ef5dc
(edit-and-eval-command): Let `read-from-minibuffer' manipulate the
Brian Fox <bfox@gnu.org>
parents:
4765
diff
changeset
|
1178 (setq newcmd |
16803
3d4a27ecfba9
(repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents:
16723
diff
changeset
|
1179 (let ((print-level nil) |
3d4a27ecfba9
(repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents:
16723
diff
changeset
|
1180 (minibuffer-history-position arg) |
20022
c9ed682ff86f
(previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents:
19888
diff
changeset
|
1181 (minibuffer-history-sexp-flag (1+ (minibuffer-depth)))) |
47599
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1182 (unwind-protect |
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1183 (read-from-minibuffer |
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1184 "Redo: " (prin1-to-string elt) read-expression-map t |
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1185 (cons 'command-history arg)) |
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1186 |
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1187 ;; If command was added to command-history as a |
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1188 ;; string, get rid of that. We want only |
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1189 ;; evaluable expressions there. |
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1190 (if (stringp (car command-history)) |
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1191 (setq command-history (cdr command-history)))))) |
5135
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
1192 |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
1193 ;; 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
|
1194 ;; add it to the history. |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
1195 (or (equal newcmd (car command-history)) |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
1196 (setq command-history (cons newcmd command-history))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1197 (eval newcmd)) |
48984
13c2502ecdc8
(repeat-complex-command): Signal real error on failure.
Richard M. Stallman <rms@gnu.org>
parents:
48628
diff
changeset
|
1198 (if command-history |
13c2502ecdc8
(repeat-complex-command): Signal real error on failure.
Richard M. Stallman <rms@gnu.org>
parents:
48628
diff
changeset
|
1199 (error "Argument %d is beyond length of command history" arg) |
13c2502ecdc8
(repeat-complex-command): Signal real error on failure.
Richard M. Stallman <rms@gnu.org>
parents:
48628
diff
changeset
|
1200 (error "There are no previous complex commands to repeat"))))) |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
1201 |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1202 (defvar minibuffer-history nil |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1203 "Default minibuffer history list. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1204 This is used for all minibuffer input |
79598
d5c0ef4db45d
(minibuffer-history, shell-command-history): Add references to history-length
Eli Zaretskii <eliz@gnu.org>
parents:
79325
diff
changeset
|
1205 except when an alternate history list is specified. |
d5c0ef4db45d
(minibuffer-history, shell-command-history): Add references to history-length
Eli Zaretskii <eliz@gnu.org>
parents:
79325
diff
changeset
|
1206 |
d5c0ef4db45d
(minibuffer-history, shell-command-history): Add references to history-length
Eli Zaretskii <eliz@gnu.org>
parents:
79325
diff
changeset
|
1207 Maximum length of the history list is determined by the value |
d5c0ef4db45d
(minibuffer-history, shell-command-history): Add references to history-length
Eli Zaretskii <eliz@gnu.org>
parents:
79325
diff
changeset
|
1208 of `history-length', which see.") |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1209 (defvar minibuffer-history-sexp-flag nil |
54259
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
1210 "Control whether history list elements are expressions or strings. |
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
1211 If the value of this variable equals current minibuffer depth, |
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
1212 they are expressions; otherwise they are strings. |
67777
8eda669e2619
(get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents:
67621
diff
changeset
|
1213 \(That convention is designed to do the right thing for |
54259
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
1214 recursive uses of the minibuffer.)") |
862
46630543d659
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
859
diff
changeset
|
1215 (setq minibuffer-history-variable 'minibuffer-history) |
70488 | 1216 (setq minibuffer-history-position nil) ;; Defvar is in C code. |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1217 (defvar minibuffer-history-search-history nil) |
858
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
1218 |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1219 (defvar minibuffer-text-before-history nil |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1220 "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
|
1221 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
|
1222 in this use of the minibuffer.") |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1223 |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1224 (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
|
1225 |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1226 (defun minibuffer-history-initialize () |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1227 (setq minibuffer-text-before-history nil)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1228 |
33683
8fc77111dd98
(minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents:
33352
diff
changeset
|
1229 (defun minibuffer-avoid-prompt (new old) |
8fc77111dd98
(minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents:
33352
diff
changeset
|
1230 "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
|
1231 (constrain-to-field nil (point-max))) |
8fc77111dd98
(minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents:
33352
diff
changeset
|
1232 |
22257
23e2e03f2bf6
(minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22157
diff
changeset
|
1233 (defcustom minibuffer-history-case-insensitive-variables nil |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
1234 "Minibuffer history variables for which matching should ignore case. |
22257
23e2e03f2bf6
(minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22157
diff
changeset
|
1235 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
|
1236 \\[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
|
1237 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
|
1238 :type '(repeat variable) |
23e2e03f2bf6
(minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22157
diff
changeset
|
1239 :group 'minibuffer) |
23e2e03f2bf6
(minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22157
diff
changeset
|
1240 |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1241 (defun previous-matching-history-element (regexp n) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1242 "Find the previous history element that matches REGEXP. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1243 \(Previous history elements refer to earlier actions.) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1244 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
|
1245 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
|
1246 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
|
1247 `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
|
1248 makes the search case-sensitive. |
22257
23e2e03f2bf6
(minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22157
diff
changeset
|
1249 See also `minibuffer-history-case-insensitive-variables'." |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1250 (interactive |
2681
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1251 (let* ((enable-recursive-minibuffers t) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1252 (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
|
1253 nil |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1254 minibuffer-local-map |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1255 nil |
56081
a72ee0aaa7f9
(previous-matching-history-element): Specify a default.
Richard M. Stallman <rms@gnu.org>
parents:
56005
diff
changeset
|
1256 'minibuffer-history-search-history |
a72ee0aaa7f9
(previous-matching-history-element): Specify a default.
Richard M. Stallman <rms@gnu.org>
parents:
56005
diff
changeset
|
1257 (car minibuffer-history-search-history)))) |
2681
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1258 ;; 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
|
1259 (list (if (string= regexp "") |
11961
b5efbe330c86
(previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents:
11572
diff
changeset
|
1260 (if minibuffer-history-search-history |
b5efbe330c86
(previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents:
11572
diff
changeset
|
1261 (car minibuffer-history-search-history) |
b5efbe330c86
(previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents:
11572
diff
changeset
|
1262 (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
|
1263 regexp) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1264 (prefix-numeric-value current-prefix-arg)))) |
32897
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1265 (unless (zerop n) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1266 (if (and (zerop minibuffer-history-position) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1267 (null minibuffer-text-before-history)) |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
1268 (setq minibuffer-text-before-history |
39612
309d26eb8616
(previous-matching-history-element): Fix misplaced parentheses.
Miles Bader <miles@gnu.org>
parents:
39597
diff
changeset
|
1269 (minibuffer-contents-no-properties))) |
32897
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1270 (let ((history (symbol-value minibuffer-history-variable)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1271 (case-fold-search |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1272 (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
|
1273 ;; On some systems, ignore case for file names. |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1274 (if (memq minibuffer-history-variable |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1275 minibuffer-history-case-insensitive-variables) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1276 t |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1277 ;; Respect the user's setting for case-fold-search: |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1278 case-fold-search) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1279 nil)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1280 prevpos |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1281 match-string |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1282 match-offset |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1283 (pos minibuffer-history-position)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1284 (while (/= n 0) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1285 (setq prevpos pos) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1286 (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
|
1287 (when (= pos prevpos) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1288 (error (if (= pos 1) |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
1289 "No later matching history item" |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
1290 "No earlier matching history item"))) |
32897
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1291 (setq match-string |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1292 (if (eq minibuffer-history-sexp-flag (minibuffer-depth)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1293 (let ((print-level nil)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1294 (prin1-to-string (nth (1- pos) history))) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1295 (nth (1- pos) history))) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1296 (setq match-offset |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1297 (if (< n 0) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1298 (and (string-match regexp match-string) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1299 (match-end 0)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1300 (and (string-match (concat ".*\\(" regexp "\\)") match-string) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1301 (match-beginning 1)))) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1302 (when match-offset |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1303 (setq n (+ n (if (< n 0) 1 -1))))) |
32897
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1304 (setq minibuffer-history-position pos) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1305 (goto-char (point-max)) |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
1306 (delete-minibuffer-contents) |
32897
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1307 (insert match-string) |
39612
309d26eb8616
(previous-matching-history-element): Fix misplaced parentheses.
Miles Bader <miles@gnu.org>
parents:
39597
diff
changeset
|
1308 (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
|
1309 (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
|
1310 next-matching-history-element)) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1311 (setq command-history (cdr command-history)))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1312 |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1313 (defun next-matching-history-element (regexp n) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1314 "Find the next history element that matches REGEXP. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1315 \(The next history element refers to a more recent action.) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1316 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
|
1317 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
|
1318 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
|
1319 `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
|
1320 makes the search case-sensitive." |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1321 (interactive |
2681
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1322 (let* ((enable-recursive-minibuffers t) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1323 (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
|
1324 nil |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1325 minibuffer-local-map |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1326 nil |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1327 'minibuffer-history-search-history |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1328 (car minibuffer-history-search-history)))) |
2681
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1329 ;; 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
|
1330 (list (if (string= regexp "") |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1331 (if minibuffer-history-search-history |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1332 (car minibuffer-history-search-history) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1333 (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
|
1334 regexp) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1335 (prefix-numeric-value current-prefix-arg)))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1336 (previous-matching-history-element regexp (- n))) |
475 | 1337 |
32105
f80262435e6c
(minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents:
31978
diff
changeset
|
1338 (defvar minibuffer-temporary-goal-position nil) |
f80262435e6c
(minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents:
31978
diff
changeset
|
1339 |
93397
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1340 (defvar minibuffer-default-add-function 'minibuffer-default-add-completions |
99643
7f30197e15d8
(minibuffer-default-add-function): Fix docstring to
Juri Linkov <juri@jurta.org>
parents:
99257
diff
changeset
|
1341 "Function run by `goto-history-element' before consuming default values. |
7f30197e15d8
(minibuffer-default-add-function): Fix docstring to
Juri Linkov <juri@jurta.org>
parents:
99257
diff
changeset
|
1342 This is useful to dynamically add more elements to the list of default values |
93397
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1343 when `goto-history-element' reaches the end of this list. |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1344 Before calling this function `goto-history-element' sets the variable |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1345 `minibuffer-default-add-done' to t, so it will call this function only |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1346 once. In special cases, when this function needs to be called more |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1347 than once, it can set `minibuffer-default-add-done' to nil explicitly, |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1348 overriding the setting of this variable to t in `goto-history-element'.") |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1349 |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1350 (defvar minibuffer-default-add-done nil |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1351 "When nil, add more elements to the end of the list of default values. |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1352 The value nil causes `goto-history-element' to add more elements to |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1353 the list of defaults when it reaches the end of this list. It does |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1354 this by calling a function defined by `minibuffer-default-add-function'.") |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1355 |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1356 (make-variable-buffer-local 'minibuffer-default-add-done) |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1357 |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1358 (defun minibuffer-default-add-completions () |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1359 "Return a list of all completions without the default value. |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1360 This function is used to add all elements of the completion table to |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1361 the end of the list of defaults just after the default value." |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1362 (let ((def minibuffer-default) |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1363 (all (all-completions "" |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1364 minibuffer-completion-table |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1365 minibuffer-completion-predicate |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1366 t))) |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1367 (if (listp def) |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1368 (append def all) |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1369 (cons def (delete def all))))) |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1370 |
82061
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1371 (defun goto-history-element (nabs) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1372 "Puts element of the minibuffer history in the minibuffer. |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1373 The argument NABS specifies the absolute history position." |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1374 (interactive "p") |
93397
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1375 (when (and (not minibuffer-default-add-done) |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1376 (functionp minibuffer-default-add-function) |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1377 (< nabs (- (if (listp minibuffer-default) |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1378 (length minibuffer-default) |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1379 1)))) |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1380 (setq minibuffer-default-add-done t |
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1381 minibuffer-default (funcall minibuffer-default-add-function))) |
85514
bcd144422383
(goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents:
85397
diff
changeset
|
1382 (let ((minimum (if minibuffer-default |
bcd144422383
(goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents:
85397
diff
changeset
|
1383 (- (if (listp minibuffer-default) |
bcd144422383
(goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents:
85397
diff
changeset
|
1384 (length minibuffer-default) |
bcd144422383
(goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents:
85397
diff
changeset
|
1385 1)) |
bcd144422383
(goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents:
85397
diff
changeset
|
1386 0)) |
82061
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1387 elt minibuffer-returned-to-present) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1388 (if (and (zerop minibuffer-history-position) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1389 (null minibuffer-text-before-history)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1390 (setq minibuffer-text-before-history |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1391 (minibuffer-contents-no-properties))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1392 (if (< nabs minimum) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1393 (if minibuffer-default |
93397
b532cf17d6ad
(minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents:
93236
diff
changeset
|
1394 (error "End of defaults; no next item") |
82061
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1395 (error "End of history; no default available"))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1396 (if (> nabs (length (symbol-value minibuffer-history-variable))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1397 (error "Beginning of history; no preceding item")) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1398 (unless (memq last-command '(next-history-element |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1399 previous-history-element)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1400 (let ((prompt-end (minibuffer-prompt-end))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1401 (set (make-local-variable 'minibuffer-temporary-goal-position) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1402 (cond ((<= (point) prompt-end) prompt-end) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1403 ((eobp) nil) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1404 (t (point)))))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1405 (goto-char (point-max)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1406 (delete-minibuffer-contents) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1407 (setq minibuffer-history-position nabs) |
85514
bcd144422383
(goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents:
85397
diff
changeset
|
1408 (cond ((< nabs 0) |
bcd144422383
(goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents:
85397
diff
changeset
|
1409 (setq elt (if (listp minibuffer-default) |
bcd144422383
(goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents:
85397
diff
changeset
|
1410 (nth (1- (abs nabs)) minibuffer-default) |
bcd144422383
(goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents:
85397
diff
changeset
|
1411 minibuffer-default))) |
82061
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1412 ((= nabs 0) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1413 (setq elt (or minibuffer-text-before-history "")) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1414 (setq minibuffer-returned-to-present t) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1415 (setq minibuffer-text-before-history nil)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1416 (t (setq elt (nth (1- minibuffer-history-position) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1417 (symbol-value minibuffer-history-variable))))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1418 (insert |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1419 (if (and (eq minibuffer-history-sexp-flag (minibuffer-depth)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1420 (not minibuffer-returned-to-present)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1421 (let ((print-level nil)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1422 (prin1-to-string elt)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1423 elt)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1424 (goto-char (or minibuffer-temporary-goal-position (point-max))))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1425 |
858
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
1426 (defun next-history-element (n) |
70369
dd437ac4b2c6
(next-history-element, previous-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70325
diff
changeset
|
1427 "Puts next element of the minibuffer history in the minibuffer. |
dd437ac4b2c6
(next-history-element, previous-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70325
diff
changeset
|
1428 With argument N, it uses the Nth following element." |
475 | 1429 (interactive "p") |
10722
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
1430 (or (zerop n) |
82061
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1431 (goto-history-element (- minibuffer-history-position n)))) |
475 | 1432 |
858
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
1433 (defun previous-history-element (n) |
70369
dd437ac4b2c6
(next-history-element, previous-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70325
diff
changeset
|
1434 "Puts previous element of the minibuffer history in the minibuffer. |
dd437ac4b2c6
(next-history-element, previous-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
70325
diff
changeset
|
1435 With argument N, it uses the Nth previous element." |
475 | 1436 (interactive "p") |
82061
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1437 (or (zerop n) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1438 (goto-history-element (+ minibuffer-history-position n)))) |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
1439 |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
1440 (defun next-complete-history-element (n) |
26054 | 1441 "Get next history element which completes the minibuffer before the point. |
1442 The contents of the minibuffer after the point are deleted, and replaced | |
1443 by the new completion." | |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
1444 (interactive "p") |
1826
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
1445 (let ((point-at-start (point))) |
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
1446 (next-matching-history-element |
26054 | 1447 (concat |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
1448 "^" (regexp-quote (buffer-substring (minibuffer-prompt-end) (point)))) |
26054 | 1449 n) |
1826
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
1450 ;; 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
|
1451 ;; 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
|
1452 ;; 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
|
1453 (goto-char point-at-start))) |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
1454 |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
1455 (defun previous-complete-history-element (n) |
5324
f091cdec77e2
(next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5151
diff
changeset
|
1456 "\ |
26054 | 1457 Get previous history element which completes the minibuffer before the point. |
1458 The contents of the minibuffer after the point are deleted, and replaced | |
1459 by the new completion." | |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
1460 (interactive "p") |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
1461 (next-complete-history-element (- n))) |
26054 | 1462 |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
1463 ;; For compatibility with the old subr of the same name. |
26054 | 1464 (defun minibuffer-prompt-width () |
1465 "Return the display width of the minibuffer prompt. | |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
1466 Return 0 if current buffer is not a minibuffer." |
26054 | 1467 ;; Return the width of everything before the field at the end of |
1468 ;; 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
|
1469 (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
|
1470 |
82061
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1471 ;; isearch minibuffer history |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1472 (add-hook 'minibuffer-setup-hook 'minibuffer-history-isearch-setup) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1473 |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1474 (defvar minibuffer-history-isearch-message-overlay) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1475 (make-variable-buffer-local 'minibuffer-history-isearch-message-overlay) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1476 |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1477 (defun minibuffer-history-isearch-setup () |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1478 "Set up a minibuffer for using isearch to search the minibuffer history. |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1479 Intended to be added to `minibuffer-setup-hook'." |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1480 (set (make-local-variable 'isearch-search-fun-function) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1481 'minibuffer-history-isearch-search) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1482 (set (make-local-variable 'isearch-message-function) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1483 'minibuffer-history-isearch-message) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1484 (set (make-local-variable 'isearch-wrap-function) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1485 'minibuffer-history-isearch-wrap) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1486 (set (make-local-variable 'isearch-push-state-function) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1487 'minibuffer-history-isearch-push-state) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1488 (add-hook 'isearch-mode-end-hook 'minibuffer-history-isearch-end nil t)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1489 |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1490 (defun minibuffer-history-isearch-end () |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1491 "Clean up the minibuffer after terminating isearch in the minibuffer." |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1492 (if minibuffer-history-isearch-message-overlay |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1493 (delete-overlay minibuffer-history-isearch-message-overlay))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1494 |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1495 (defun minibuffer-history-isearch-search () |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1496 "Return the proper search function, for isearch in minibuffer history." |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1497 (cond |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1498 (isearch-word |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1499 (if isearch-forward 'word-search-forward 'word-search-backward)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1500 (t |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1501 (lambda (string bound noerror) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1502 (let ((search-fun |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1503 ;; Use standard functions to search within minibuffer text |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1504 (cond |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1505 (isearch-regexp |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1506 (if isearch-forward 're-search-forward 're-search-backward)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1507 (t |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1508 (if isearch-forward 'search-forward 'search-backward)))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1509 found) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1510 ;; Avoid lazy-highlighting matches in the minibuffer prompt when |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1511 ;; searching forward. Lazy-highlight calls this lambda with the |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1512 ;; bound arg, so skip the minibuffer prompt. |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1513 (if (and bound isearch-forward (< (point) (minibuffer-prompt-end))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1514 (goto-char (minibuffer-prompt-end))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1515 (or |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1516 ;; 1. First try searching in the initial minibuffer text |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1517 (funcall search-fun string |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1518 (if isearch-forward bound (minibuffer-prompt-end)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1519 noerror) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1520 ;; 2. If the above search fails, start putting next/prev history |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1521 ;; elements in the minibuffer successively, and search the string |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1522 ;; in them. Do this only when bound is nil (i.e. not while |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1523 ;; lazy-highlighting search strings in the current minibuffer text). |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1524 (unless bound |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1525 (condition-case nil |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1526 (progn |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1527 (while (not found) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1528 (cond (isearch-forward |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1529 (next-history-element 1) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1530 (goto-char (minibuffer-prompt-end))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1531 (t |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1532 (previous-history-element 1) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1533 (goto-char (point-max)))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1534 (setq isearch-barrier (point) isearch-opoint (point)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1535 ;; After putting the next/prev history element, search |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1536 ;; the string in them again, until next-history-element |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1537 ;; or previous-history-element raises an error at the |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1538 ;; beginning/end of history. |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1539 (setq found (funcall search-fun string |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1540 (unless isearch-forward |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1541 ;; For backward search, don't search |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1542 ;; in the minibuffer prompt |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1543 (minibuffer-prompt-end)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1544 noerror))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1545 ;; Return point of the new search result |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1546 (point)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1547 ;; Return nil when next(prev)-history-element fails |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1548 (error nil))))))))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1549 |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1550 (defun minibuffer-history-isearch-message (&optional c-q-hack ellipsis) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1551 "Display the minibuffer history search prompt. |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1552 If there are no search errors, this function displays an overlay with |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1553 the isearch prompt which replaces the original minibuffer prompt. |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1554 Otherwise, it displays the standard isearch message returned from |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1555 `isearch-message'." |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1556 (if (not (and (minibufferp) isearch-success (not isearch-error))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1557 ;; Use standard function `isearch-message' when not in the minibuffer, |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1558 ;; or search fails, or has an error (like incomplete regexp). |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1559 ;; This function overwrites minibuffer text with isearch message, |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1560 ;; so it's possible to see what is wrong in the search string. |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1561 (isearch-message c-q-hack ellipsis) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1562 ;; Otherwise, put the overlay with the standard isearch prompt over |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1563 ;; the initial minibuffer prompt. |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1564 (if (overlayp minibuffer-history-isearch-message-overlay) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1565 (move-overlay minibuffer-history-isearch-message-overlay |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1566 (point-min) (minibuffer-prompt-end)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1567 (setq minibuffer-history-isearch-message-overlay |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1568 (make-overlay (point-min) (minibuffer-prompt-end))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1569 (overlay-put minibuffer-history-isearch-message-overlay 'evaporate t)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1570 (overlay-put minibuffer-history-isearch-message-overlay |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1571 'display (isearch-message-prefix c-q-hack ellipsis)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1572 ;; And clear any previous isearch message. |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1573 (message ""))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1574 |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1575 (defun minibuffer-history-isearch-wrap () |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
1576 "Wrap the minibuffer history search when search fails. |
82061
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1577 Move point to the first history element for a forward search, |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1578 or to the last history element for a backward search." |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1579 (unless isearch-word |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1580 ;; When `minibuffer-history-isearch-search' fails on reaching the |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1581 ;; beginning/end of the history, wrap the search to the first/last |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1582 ;; minibuffer history element. |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1583 (if isearch-forward |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1584 (goto-history-element (length (symbol-value minibuffer-history-variable))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1585 (goto-history-element 0)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1586 (setq isearch-success t)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1587 (goto-char (if isearch-forward (minibuffer-prompt-end) (point-max)))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1588 |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1589 (defun minibuffer-history-isearch-push-state () |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1590 "Save a function restoring the state of minibuffer history search. |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1591 Save `minibuffer-history-position' to the additional state parameter |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1592 in the search status stack." |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1593 `(lambda (cmd) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1594 (minibuffer-history-isearch-pop-state cmd ,minibuffer-history-position))) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1595 |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1596 (defun minibuffer-history-isearch-pop-state (cmd hist-pos) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1597 "Restore the minibuffer history search state. |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
1598 Go to the history element by the absolute history position HIST-POS." |
82061
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1599 (goto-history-element hist-pos)) |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1600 |
62d33d80e1db
(goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents:
81736
diff
changeset
|
1601 |
475 | 1602 ;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
|
1603 (defalias 'advertised-undo 'undo) |
475 | 1604 |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1605 (defconst undo-equiv-table (make-hash-table :test 'eq :weakness t) |
61469
d971c29e6cb4
(undo): Record t in undo-equiv-table
Richard M. Stallman <rms@gnu.org>
parents:
61361
diff
changeset
|
1606 "Table mapping redo records to the corresponding undo one. |
d971c29e6cb4
(undo): Record t in undo-equiv-table
Richard M. Stallman <rms@gnu.org>
parents:
61361
diff
changeset
|
1607 A redo record for undo-in-region maps to t. |
d971c29e6cb4
(undo): Record t in undo-equiv-table
Richard M. Stallman <rms@gnu.org>
parents:
61361
diff
changeset
|
1608 A redo record for ordinary undo maps to the following (earlier) undo.") |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1609 |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1610 (defvar undo-in-region nil |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1611 "Non-nil if `pending-undo-list' is not just a tail of `buffer-undo-list'.") |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1612 |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1613 (defvar undo-no-redo nil |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1614 "If t, `undo' doesn't go through redo entries.") |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1615 |
59782
ec7c04e04f71
(undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents:
59701
diff
changeset
|
1616 (defvar pending-undo-list nil |
ec7c04e04f71
(undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents:
59701
diff
changeset
|
1617 "Within a run of consecutive undo commands, list remaining to be undone. |
63487
eb15f8c9bc85
(undo-more): Don't use `format' on `error' arguments. Improve
Juanma Barranquero <lekktu@gmail.com>
parents:
63485
diff
changeset
|
1618 If t, we undid all the way to the end of it.") |
59782
ec7c04e04f71
(undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents:
59701
diff
changeset
|
1619 |
475 | 1620 (defun undo (&optional arg) |
1621 "Undo some previous changes. | |
1622 Repeat this command to undo more changes. | |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
1623 A numeric ARG serves as a repeat count. |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1624 |
32899
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
1625 In Transient Mark mode when the mark is active, only undo changes within |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1626 the current region. Similarly, when not in Transient Mark mode, just \\[universal-argument] |
32899
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
1627 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
|
1628 (interactive "*P") |
41996
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1629 ;; 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
|
1630 ;; 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
|
1631 ;; 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
|
1632 ;; 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
|
1633 ;; 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
|
1634 ;; you must type some other command. |
3408
8ffb00332c5f
(undo): Pass proper arg to delete-auto-save-file-if-necessary.
Richard M. Stallman <rms@gnu.org>
parents:
3034
diff
changeset
|
1635 (let ((modified (buffer-modified-p)) |
66536
ef5c1ec14e1f
(undo): Display message at end, not at start.
Richard M. Stallman <rms@gnu.org>
parents:
66405
diff
changeset
|
1636 (recent-save (recent-auto-save-p)) |
ef5c1ec14e1f
(undo): Display message at end, not at start.
Richard M. Stallman <rms@gnu.org>
parents:
66405
diff
changeset
|
1637 message) |
54259
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
1638 ;; If we get an error in undo-start, |
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
1639 ;; the next command should not be a "consecutive undo". |
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
1640 ;; So set `this-command' to something other than `undo'. |
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
1641 (setq this-command 'undo-start) |
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
1642 |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1643 (unless (and (eq last-command 'undo) |
59782
ec7c04e04f71
(undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents:
59701
diff
changeset
|
1644 (or (eq pending-undo-list t) |
ec7c04e04f71
(undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents:
59701
diff
changeset
|
1645 ;; If something (a timer or filter?) changed the buffer |
ec7c04e04f71
(undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents:
59701
diff
changeset
|
1646 ;; since the previous command, don't continue the undo seq. |
ec7c04e04f71
(undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents:
59701
diff
changeset
|
1647 (let ((list buffer-undo-list)) |
ec7c04e04f71
(undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents:
59701
diff
changeset
|
1648 (while (eq (car list) nil) |
ec7c04e04f71
(undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents:
59701
diff
changeset
|
1649 (setq list (cdr list))) |
ec7c04e04f71
(undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents:
59701
diff
changeset
|
1650 ;; If the last undo record made was made by undo |
ec7c04e04f71
(undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents:
59701
diff
changeset
|
1651 ;; it shows nothing else happened in between. |
ec7c04e04f71
(undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents:
59701
diff
changeset
|
1652 (gethash list undo-equiv-table)))) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1653 (setq undo-in-region |
93561
e39e5bb86d6b
(beginning-of-buffer, end-of-buffer, goto-line, undo)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93548
diff
changeset
|
1654 (or (region-active-p) (and arg (not (numberp arg))))) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1655 (if undo-in-region |
32899
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
1656 (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
|
1657 (undo-start)) |
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
1658 ;; 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
|
1659 (undo-more 1)) |
54909
2a24736eb420
(completion-setup-function): Set an initial value to `element-common-end' before entering loop. Set a value to `element-common-end' at the end of loop. The bug is reported by Juri Linkov <juri@jurta.org> in emacs-devel list.
Masatake YAMATO <jet@gyve.org>
parents:
54554
diff
changeset
|
1660 ;; If we got this far, the next command should be a consecutive undo. |
54259
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
1661 (setq this-command 'undo) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1662 ;; Check to see whether we're hitting a redo record, and if |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1663 ;; so, ask the user whether she wants to skip the redo/undo pair. |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1664 (let ((equiv (gethash pending-undo-list undo-equiv-table))) |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1665 (or (eq (selected-window) (minibuffer-window)) |
66536
ef5c1ec14e1f
(undo): Display message at end, not at start.
Richard M. Stallman <rms@gnu.org>
parents:
66405
diff
changeset
|
1666 (setq message (if undo-in-region |
ef5c1ec14e1f
(undo): Display message at end, not at start.
Richard M. Stallman <rms@gnu.org>
parents:
66405
diff
changeset
|
1667 (if equiv "Redo in region!" "Undo in region!") |
ef5c1ec14e1f
(undo): Display message at end, not at start.
Richard M. Stallman <rms@gnu.org>
parents:
66405
diff
changeset
|
1668 (if equiv "Redo!" "Undo!")))) |
61531
34b31319dc9b
(undo): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
61469
diff
changeset
|
1669 (when (and (consp equiv) undo-no-redo) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1670 ;; The equiv entry might point to another redo record if we have done |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1671 ;; undo-redo-undo-redo-... so skip to the very last equiv. |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1672 (while (let ((next (gethash equiv undo-equiv-table))) |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1673 (if next (setq equiv next)))) |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1674 (setq pending-undo-list equiv))) |
32899
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
1675 (undo-more |
93561
e39e5bb86d6b
(beginning-of-buffer, end-of-buffer, goto-line, undo)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93548
diff
changeset
|
1676 (if (numberp arg) |
32899
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
1677 (prefix-numeric-value arg) |
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
1678 1)) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1679 ;; Record the fact that the just-generated undo records come from an |
61469
d971c29e6cb4
(undo): Record t in undo-equiv-table
Richard M. Stallman <rms@gnu.org>
parents:
61361
diff
changeset
|
1680 ;; undo operation--that is, they are redo records. |
d971c29e6cb4
(undo): Record t in undo-equiv-table
Richard M. Stallman <rms@gnu.org>
parents:
61361
diff
changeset
|
1681 ;; In the ordinary case (not within a region), map the redo |
d971c29e6cb4
(undo): Record t in undo-equiv-table
Richard M. Stallman <rms@gnu.org>
parents:
61361
diff
changeset
|
1682 ;; record to the following undos. |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1683 ;; I don't know how to do that in the undo-in-region case. |
102543
78bd54d14660
(undo): Don't loop when encountering empty undo records.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102467
diff
changeset
|
1684 (let ((list buffer-undo-list)) |
78bd54d14660
(undo): Don't loop when encountering empty undo records.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102467
diff
changeset
|
1685 ;; Strip any leading undo boundaries there might be, like we do |
78bd54d14660
(undo): Don't loop when encountering empty undo records.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102467
diff
changeset
|
1686 ;; above when checking. |
78bd54d14660
(undo): Don't loop when encountering empty undo records.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102467
diff
changeset
|
1687 (while (eq (car list) nil) |
78bd54d14660
(undo): Don't loop when encountering empty undo records.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102467
diff
changeset
|
1688 (setq list (cdr list))) |
78bd54d14660
(undo): Don't loop when encountering empty undo records.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102467
diff
changeset
|
1689 (puthash list (if undo-in-region t pending-undo-list) |
78bd54d14660
(undo): Don't loop when encountering empty undo records.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102467
diff
changeset
|
1690 undo-equiv-table)) |
6386
1eabdff45c61
(undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents:
6237
diff
changeset
|
1691 ;; 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
|
1692 ;; 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
|
1693 (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
|
1694 (prev nil)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1695 (while (car tail) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1696 (when (integerp (car tail)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1697 (let ((pos (car tail))) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1698 (if prev |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1699 (setcdr prev (cdr tail)) |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1700 (setq buffer-undo-list (cdr tail))) |
39157
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1701 (setq tail (cdr tail)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1702 (while (car tail) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1703 (if (eq pos (car tail)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1704 (if prev |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1705 (setcdr prev (cdr tail)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1706 (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
|
1707 (setq prev tail)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1708 (setq tail (cdr tail))) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1709 (setq tail nil))) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1710 (setq prev tail tail (cdr tail)))) |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1711 ;; Record what the current undo list says, |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1712 ;; so the next command can tell if the buffer was modified in between. |
475 | 1713 (and modified (not (buffer-modified-p)) |
66536
ef5c1ec14e1f
(undo): Display message at end, not at start.
Richard M. Stallman <rms@gnu.org>
parents:
66405
diff
changeset
|
1714 (delete-auto-save-file-if-necessary recent-save)) |
ef5c1ec14e1f
(undo): Display message at end, not at start.
Richard M. Stallman <rms@gnu.org>
parents:
66405
diff
changeset
|
1715 ;; Display a message announcing success. |
ef5c1ec14e1f
(undo): Display message at end, not at start.
Richard M. Stallman <rms@gnu.org>
parents:
66405
diff
changeset
|
1716 (if message |
87096
a99a2e8bc21e
Fix possibly buggy calls to `message'.
Deepak Goel <deego@gnufans.org>
parents:
86104
diff
changeset
|
1717 (message "%s" message)))) |
475 | 1718 |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1719 (defun buffer-disable-undo (&optional buffer) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1720 "Make BUFFER stop keeping undo information. |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1721 No argument or nil as argument means do this for the current buffer." |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1722 (interactive) |
59162
ced0821d5f7c
(buffer-disable-undo): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
59157
diff
changeset
|
1723 (with-current-buffer (if buffer (get-buffer buffer) (current-buffer)) |
59261
73f5be00ba89
(undo): Use undo-equiv-table to detect
Richard M. Stallman <rms@gnu.org>
parents:
59178
diff
changeset
|
1724 (setq buffer-undo-list t))) |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1725 |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1726 (defun undo-only (&optional arg) |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1727 "Undo some previous changes. |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1728 Repeat this command to undo more changes. |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
1729 A numeric ARG serves as a repeat count. |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1730 Contrary to `undo', this will not redo a previous undo." |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1731 (interactive "*p") |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1732 (let ((undo-no-redo t)) (undo arg))) |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1733 |
22725
6d0f7798f157
(undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22375
diff
changeset
|
1734 (defvar undo-in-progress nil |
6d0f7798f157
(undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22375
diff
changeset
|
1735 "Non-nil while performing an undo. |
6d0f7798f157
(undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22375
diff
changeset
|
1736 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
|
1737 |
63487
eb15f8c9bc85
(undo-more): Don't use `format' on `error' arguments. Improve
Juanma Barranquero <lekktu@gmail.com>
parents:
63485
diff
changeset
|
1738 (defun undo-more (n) |
475 | 1739 "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
|
1740 Call `undo-start' to get ready to undo recent changes, |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1741 then call `undo-more' one or more times to undo them." |
59782
ec7c04e04f71
(undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents:
59701
diff
changeset
|
1742 (or (listp pending-undo-list) |
63487
eb15f8c9bc85
(undo-more): Don't use `format' on `error' arguments. Improve
Juanma Barranquero <lekktu@gmail.com>
parents:
63485
diff
changeset
|
1743 (error (concat "No further undo information" |
73190
181f8fa16272
(undo-more): When undo information for the region is exhausted, say
Eli Zaretskii <eliz@gnu.org>
parents:
73167
diff
changeset
|
1744 (and undo-in-region " for region")))) |
22725
6d0f7798f157
(undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22375
diff
changeset
|
1745 (let ((undo-in-progress t)) |
99008
91e50ad51eec
(undo-more): Add comment explaining the operations on pending-undo-list
Alan Mackenzie <acm@muc.de>
parents:
98995
diff
changeset
|
1746 ;; Note: The following, while pulling elements off |
91e50ad51eec
(undo-more): Add comment explaining the operations on pending-undo-list
Alan Mackenzie <acm@muc.de>
parents:
98995
diff
changeset
|
1747 ;; `pending-undo-list' will call primitive change functions which |
91e50ad51eec
(undo-more): Add comment explaining the operations on pending-undo-list
Alan Mackenzie <acm@muc.de>
parents:
98995
diff
changeset
|
1748 ;; will push more elements onto `buffer-undo-list'. |
63487
eb15f8c9bc85
(undo-more): Don't use `format' on `error' arguments. Improve
Juanma Barranquero <lekktu@gmail.com>
parents:
63485
diff
changeset
|
1749 (setq pending-undo-list (primitive-undo n pending-undo-list)) |
59782
ec7c04e04f71
(undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents:
59701
diff
changeset
|
1750 (if (null pending-undo-list) |
ec7c04e04f71
(undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents:
59701
diff
changeset
|
1751 (setq pending-undo-list t)))) |
475 | 1752 |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1753 ;; Deep copy of a list |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1754 (defun undo-copy-list (list) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1755 "Make a copy of undo list LIST." |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1756 (mapcar 'undo-copy-list-1 list)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1757 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1758 (defun undo-copy-list-1 (elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1759 (if (consp elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1760 (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
|
1761 elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1762 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1763 (defun undo-start (&optional beg end) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1764 "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
|
1765 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
|
1766 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
|
1767 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
|
1768 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
|
1769 (if (eq buffer-undo-list t) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1770 (error "No undo information in this buffer")) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1771 (setq pending-undo-list |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1772 (if (and beg end (not (= beg end))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1773 (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
|
1774 buffer-undo-list))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1775 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1776 (defvar undo-adjusted-markers) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1777 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1778 (defun undo-make-selective-list (start end) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1779 "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
|
1780 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
|
1781 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
|
1782 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
|
1783 we stop and ignore all further elements." |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1784 (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
|
1785 (undo-list (list nil)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1786 undo-adjusted-markers |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1787 some-rejected |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1788 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
|
1789 (while undo-list-copy |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1790 (setq undo-elt (car undo-list-copy)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1791 (let ((keep-this |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1792 (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
|
1793 ;; This is a "was unmodified" element. |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1794 ;; 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
|
1795 (not some-rejected)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1796 (t |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1797 (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
|
1798 (if keep-this |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1799 (progn |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1800 (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
|
1801 ;; 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
|
1802 (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
|
1803 (eq undo-elt nil))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1804 (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
|
1805 (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
|
1806 (setq undo-list-copy nil) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1807 (setq some-rejected t) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1808 (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
|
1809 (setq delta (undo-delta undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1810 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1811 (when (/= (cdr delta) 0) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1812 (let ((position (car delta)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1813 (offset (cdr delta))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1814 |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
1815 ;; 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
|
1816 ;; 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
|
1817 ;; 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
|
1818 ;; 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
|
1819 ;; 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
|
1820 ;; output |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1821 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1822 (while temp-undo-list |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1823 (setq undo-elt (car temp-undo-list)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1824 (cond ((integerp undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1825 (if (>= undo-elt position) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1826 (setcar temp-undo-list (- undo-elt offset)))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1827 ((atom undo-elt) nil) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1828 ((stringp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1829 ;; (TEXT . POSITION) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1830 (let ((text-pos (abs (cdr undo-elt))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1831 (point-at-end (< (cdr undo-elt) 0 ))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1832 (if (>= text-pos position) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1833 (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
|
1834 (- text-pos offset)))))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1835 ((integerp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1836 ;; (BEGIN . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1837 (when (>= (car undo-elt) position) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1838 (setcar undo-elt (- (car undo-elt) offset)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1839 (setcdr undo-elt (- (cdr undo-elt) offset)))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1840 ((null (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1841 ;; (nil PROPERTY VALUE BEG . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1842 (let ((tail (nthcdr 3 undo-elt))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1843 (when (>= (car tail) position) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1844 (setcar tail (- (car tail) offset)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1845 (setcdr tail (- (cdr tail) offset)))))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1846 (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
|
1847 (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
|
1848 (nreverse undo-list))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1849 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1850 (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
|
1851 "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
|
1852 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
|
1853 (cond ((integerp undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1854 (and (>= undo-elt start) |
47316
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
1855 (<= undo-elt end))) |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1856 ((eq undo-elt nil) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1857 t) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1858 ((atom undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1859 nil) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1860 ((stringp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1861 ;; (TEXT . POSITION) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1862 (and (>= (abs (cdr undo-elt)) start) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1863 (< (abs (cdr undo-elt)) end))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1864 ((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
|
1865 ;; 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
|
1866 ;; See if MARKER is inside the region. |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1867 (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
|
1868 (unless alist-elt |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1869 (setq alist-elt (cons (car undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1870 (marker-position (car undo-elt)))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1871 (setq undo-adjusted-markers |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1872 (cons alist-elt undo-adjusted-markers))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1873 (and (cdr alist-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1874 (>= (cdr alist-elt) start) |
47316
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
1875 (<= (cdr alist-elt) end)))) |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1876 ((null (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1877 ;; (nil PROPERTY VALUE BEG . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1878 (let ((tail (nthcdr 3 undo-elt))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1879 (and (>= (car tail) start) |
47316
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
1880 (<= (cdr tail) end)))) |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1881 ((integerp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1882 ;; (BEGIN . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1883 (and (>= (car undo-elt) start) |
47316
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
1884 (<= (cdr undo-elt) end))))) |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1885 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1886 (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
|
1887 "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
|
1888 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
|
1889 is not *inside* the region START...END." |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1890 (cond ((atom undo-elt) nil) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1891 ((null (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1892 ;; (nil PROPERTY VALUE BEG . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1893 (let ((tail (nthcdr 3 undo-elt))) |
73209
4a27744452bb
(undo-elt-crosses-region): Fix the inequalities.
Richard M. Stallman <rms@gnu.org>
parents:
73190
diff
changeset
|
1894 (and (< (car tail) end) |
4a27744452bb
(undo-elt-crosses-region): Fix the inequalities.
Richard M. Stallman <rms@gnu.org>
parents:
73190
diff
changeset
|
1895 (> (cdr tail) start)))) |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1896 ((integerp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1897 ;; (BEGIN . END) |
73209
4a27744452bb
(undo-elt-crosses-region): Fix the inequalities.
Richard M. Stallman <rms@gnu.org>
parents:
73190
diff
changeset
|
1898 (and (< (car undo-elt) end) |
4a27744452bb
(undo-elt-crosses-region): Fix the inequalities.
Richard M. Stallman <rms@gnu.org>
parents:
73190
diff
changeset
|
1899 (> (cdr undo-elt) start))))) |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1900 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1901 ;; 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
|
1902 ;; 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
|
1903 ;; the undo. |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1904 (defun undo-delta (undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1905 (if (consp undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1906 (cond ((stringp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1907 ;; (TEXT . POSITION) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1908 (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
|
1909 ((integerp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1910 ;; (BEGIN . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1911 (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
|
1912 (t |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1913 '(0 . 0))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1914 '(0 . 0))) |
59055
f6e8a2dc456a
(undo-outer-limit-truncate): New function.
Richard M. Stallman <rms@gnu.org>
parents:
58961
diff
changeset
|
1915 |
71793
205070e11ae3
* simple.el (undo-ask-before-discard): Set to nil.
Chong Yidong <cyd@stupidchicken.com>
parents:
71625
diff
changeset
|
1916 (defcustom undo-ask-before-discard nil |
59790
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1917 "If non-nil ask about discarding undo info for the current command. |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1918 Normally, Emacs discards the undo info for the current command if |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1919 it exceeds `undo-outer-limit'. But if you set this option |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1920 non-nil, it asks in the echo area whether to discard the info. |
73330
400487787181
* dnd.el (dnd-handle-one-url): Fix typo in doc-string.
Jan Djärv <jan.h.d@swipnet.se>
parents:
73209
diff
changeset
|
1921 If you answer no, there is a slight risk that Emacs might crash, so |
59790
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1922 only do it if you really want to undo the command. |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1923 |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1924 This option is mainly intended for debugging. You have to be |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1925 careful if you use it for other purposes. Garbage collection is |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1926 inhibited while the question is asked, meaning that Emacs might |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1927 leak memory. So you should make sure that you do not wait |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1928 excessively long before answering the question." |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1929 :type 'boolean |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1930 :group 'undo |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59790
diff
changeset
|
1931 :version "22.1") |
59790
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1932 |
59178
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
1933 (defvar undo-extra-outer-limit nil |
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
1934 "If non-nil, an extra level of size that's ok in an undo item. |
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
1935 We don't ask the user about truncating the undo list until the |
59790
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1936 current item gets bigger than this amount. |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1937 |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1938 This variable only matters if `undo-ask-before-discard' is non-nil.") |
59178
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
1939 (make-variable-buffer-local 'undo-extra-outer-limit) |
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
1940 |
59790
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1941 ;; When the first undo batch in an undo list is longer than |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1942 ;; undo-outer-limit, this function gets called to warn the user that |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1943 ;; the undo info for the current command was discarded. Garbage |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1944 ;; collection is inhibited around the call, so it had better not do a |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1945 ;; lot of consing. |
59055
f6e8a2dc456a
(undo-outer-limit-truncate): New function.
Richard M. Stallman <rms@gnu.org>
parents:
58961
diff
changeset
|
1946 (setq undo-outer-limit-function 'undo-outer-limit-truncate) |
f6e8a2dc456a
(undo-outer-limit-truncate): New function.
Richard M. Stallman <rms@gnu.org>
parents:
58961
diff
changeset
|
1947 (defun undo-outer-limit-truncate (size) |
59790
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1948 (if undo-ask-before-discard |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1949 (when (or (null undo-extra-outer-limit) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1950 (> size undo-extra-outer-limit)) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1951 ;; Don't ask the question again unless it gets even bigger. |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1952 ;; This applies, in particular, if the user quits from the question. |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1953 ;; Such a quit quits out of GC, but something else will call GC |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1954 ;; again momentarily. It will call this function again, |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1955 ;; but we don't want to ask the question again. |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1956 (setq undo-extra-outer-limit (+ size 50000)) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1957 (if (let (use-dialog-box track-mouse executing-kbd-macro ) |
70325
c8e4a9156d18
(undo-outer-limit-truncate): Put quotes around buffer name in messages.
Richard M. Stallman <rms@gnu.org>
parents:
69899
diff
changeset
|
1958 (yes-or-no-p (format "Buffer `%s' undo info is %d bytes long; discard it? " |
59790
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1959 (buffer-name) size))) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1960 (progn (setq buffer-undo-list nil) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1961 (setq undo-extra-outer-limit nil) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1962 t) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1963 nil)) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1964 (display-warning '(undo discard-info) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1965 (concat |
70325
c8e4a9156d18
(undo-outer-limit-truncate): Put quotes around buffer name in messages.
Richard M. Stallman <rms@gnu.org>
parents:
69899
diff
changeset
|
1966 (format "Buffer `%s' undo info was %d bytes long.\n" |
59790
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1967 (buffer-name) size) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1968 "The undo info was discarded because it exceeded \ |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1969 `undo-outer-limit'. |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1970 |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1971 This is normal if you executed a command that made a huge change |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1972 to the buffer. In that case, to prevent similar problems in the |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1973 future, set `undo-outer-limit' to a value that is large enough to |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1974 cover the maximum size of normal changes you expect a single |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1975 command to make, but not so large that it might exceed the |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1976 maximum memory allotted to Emacs. |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1977 |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1978 If you did not execute any such command, the situation is |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1979 probably due to a bug and you should report it. |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1980 |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1981 You can disable the popping up of this buffer by adding the entry |
102556
a9b46e59b066
(undo-outer-limit-truncate): Mention that warning-suppress-types is
Chong Yidong <cyd@stupidchicken.com>
parents:
102543
diff
changeset
|
1982 \(undo discard-info) to the user option `warning-suppress-types', |
a9b46e59b066
(undo-outer-limit-truncate): Mention that warning-suppress-types is
Chong Yidong <cyd@stupidchicken.com>
parents:
102543
diff
changeset
|
1983 which is defined in the `warnings' library.\n") |
59790
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1984 :warning) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1985 (setq buffer-undo-list nil) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1986 t)) |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
1987 |
4374
1a64d641cea4
(shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4289
diff
changeset
|
1988 (defvar shell-command-history nil |
79598
d5c0ef4db45d
(minibuffer-history, shell-command-history): Add references to history-length
Eli Zaretskii <eliz@gnu.org>
parents:
79325
diff
changeset
|
1989 "History list for some commands that read shell commands. |
d5c0ef4db45d
(minibuffer-history, shell-command-history): Add references to history-length
Eli Zaretskii <eliz@gnu.org>
parents:
79325
diff
changeset
|
1990 |
d5c0ef4db45d
(minibuffer-history, shell-command-history): Add references to history-length
Eli Zaretskii <eliz@gnu.org>
parents:
79325
diff
changeset
|
1991 Maximum length of the history list is determined by the value |
d5c0ef4db45d
(minibuffer-history, shell-command-history): Add references to history-length
Eli Zaretskii <eliz@gnu.org>
parents:
79325
diff
changeset
|
1992 of `history-length', which see.") |
4374
1a64d641cea4
(shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4289
diff
changeset
|
1993 |
9779
1286985b5a26
(shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9771
diff
changeset
|
1994 (defvar shell-command-switch "-c" |
1286985b5a26
(shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9771
diff
changeset
|
1995 "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
|
1996 |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1997 (defvar shell-command-default-error-buffer nil |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1998 "*Buffer name for `shell-command' and `shell-command-on-region' error output. |
46092
4eddd0d42a2f
(shell-command-default-error-buffer): Doc fix.
Andreas Schwab <schwab@suse.de>
parents:
46090
diff
changeset
|
1999 This buffer is used when `shell-command' or `shell-command-on-region' |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2000 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
|
2001 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
|
2002 |
94251
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2003 (declare-function mailcap-file-default-commands "mailcap" (files)) |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2004 |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2005 (defun minibuffer-default-add-shell-commands () |
100821
e66926f7879f
(minibuffer-default-add-shell-commands): Fix doc-string typo.
Martin Rudalics <rudalics@gmx.at>
parents:
100810
diff
changeset
|
2006 "Return a list of all commands associated with the current file. |
98892
a771a8a7af3c
(minibuffer-default-add-shell-commands): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
98670
diff
changeset
|
2007 This function is used to add all related commands retrieved by `mailcap' |
94251
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2008 to the end of the list of defaults just after the default value." |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2009 (interactive) |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2010 (let* ((filename (if (listp minibuffer-default) |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2011 (car minibuffer-default) |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2012 minibuffer-default)) |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2013 (commands (and filename (require 'mailcap nil t) |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2014 (mailcap-file-default-commands (list filename))))) |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2015 (setq commands (mapcar (lambda (command) |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2016 (concat command " " filename)) |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2017 commands)) |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2018 (if (listp minibuffer-default) |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2019 (append minibuffer-default commands) |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2020 (cons minibuffer-default commands)))) |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2021 |
98670
d87ee665546a
(shell-delimiter-argument-list, shell-file-name-chars)
Glenn Morris <rgm@gnu.org>
parents:
98609
diff
changeset
|
2022 (defvar shell-delimiter-argument-list) |
d87ee665546a
(shell-delimiter-argument-list, shell-file-name-chars)
Glenn Morris <rgm@gnu.org>
parents:
98609
diff
changeset
|
2023 (defvar shell-file-name-chars) |
d87ee665546a
(shell-delimiter-argument-list, shell-file-name-chars)
Glenn Morris <rgm@gnu.org>
parents:
98609
diff
changeset
|
2024 (defvar shell-file-name-quote-list) |
d87ee665546a
(shell-delimiter-argument-list, shell-file-name-chars)
Glenn Morris <rgm@gnu.org>
parents:
98609
diff
changeset
|
2025 |
93112
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2026 (defun minibuffer-complete-shell-command () |
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2027 "Dynamically complete shell command at point." |
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2028 (interactive) |
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2029 (require 'shell) |
98609
ca935ec23969
(minibuffer-complete-shell-command): Bind
Andreas Schwab <schwab@suse.de>
parents:
97481
diff
changeset
|
2030 (let ((comint-delimiter-argument-list shell-delimiter-argument-list) |
ca935ec23969
(minibuffer-complete-shell-command): Bind
Andreas Schwab <schwab@suse.de>
parents:
97481
diff
changeset
|
2031 (comint-file-name-chars shell-file-name-chars) |
ca935ec23969
(minibuffer-complete-shell-command): Bind
Andreas Schwab <schwab@suse.de>
parents:
97481
diff
changeset
|
2032 (comint-file-name-quote-list shell-file-name-quote-list)) |
ca935ec23969
(minibuffer-complete-shell-command): Bind
Andreas Schwab <schwab@suse.de>
parents:
97481
diff
changeset
|
2033 (run-hook-with-args-until-success 'shell-dynamic-complete-functions))) |
93112
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2034 |
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2035 (defvar minibuffer-local-shell-command-map |
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2036 (let ((map (make-sparse-keymap))) |
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2037 (set-keymap-parent map minibuffer-local-map) |
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2038 (define-key map "\t" 'minibuffer-complete-shell-command) |
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2039 map) |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
2040 "Keymap used for completing shell commands in minibuffer.") |
93112
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2041 |
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2042 (defun read-shell-command (prompt &optional initial-contents hist &rest args) |
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2043 "Read a shell command from the minibuffer. |
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2044 The arguments are the same as the ones of `read-from-minibuffer', |
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2045 except READ and KEYMAP are missing and HIST defaults |
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2046 to `shell-command-history'." |
97150
9718b5cb3616
(read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents:
97128
diff
changeset
|
2047 (minibuffer-with-setup-hook |
9718b5cb3616
(read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents:
97128
diff
changeset
|
2048 (lambda () |
9718b5cb3616
(read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents:
97128
diff
changeset
|
2049 (set (make-local-variable 'minibuffer-default-add-function) |
9718b5cb3616
(read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents:
97128
diff
changeset
|
2050 'minibuffer-default-add-shell-commands)) |
9718b5cb3616
(read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents:
97128
diff
changeset
|
2051 (apply 'read-from-minibuffer prompt initial-contents |
9718b5cb3616
(read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents:
97128
diff
changeset
|
2052 minibuffer-local-shell-command-map |
9718b5cb3616
(read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents:
97128
diff
changeset
|
2053 nil |
9718b5cb3616
(read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents:
97128
diff
changeset
|
2054 (or hist 'shell-command-history) |
9718b5cb3616
(read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents:
97128
diff
changeset
|
2055 args))) |
93112
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2056 |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2057 (defun shell-command (command &optional output-buffer error-buffer) |
475 | 2058 "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
|
2059 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
|
2060 |
475 | 2061 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
|
2062 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
|
2063 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
|
2064 |
33312
1e1d6d077288
(shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents:
32899
diff
changeset
|
2065 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
|
2066 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
|
2067 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
|
2068 `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
|
2069 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
|
2070 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
|
2071 |
19109
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
2072 To specify a coding system for converting non-ASCII characters |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
2073 in the shell command output, use \\[universal-coding-system-argument] \ |
19109
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
2074 before this command. |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
2075 |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
2076 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
|
2077 `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
|
2078 |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
2079 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
|
2080 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
|
2081 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
|
2082 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
|
2083 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
|
2084 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
|
2085 |
41996
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
2086 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
|
2087 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
|
2088 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
|
2089 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
|
2090 \(determined by the variable `max-mini-window-height' if |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
2091 `resize-mini-windows' is non-nil), it is shown there. |
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
2092 Otherwise,the buffer containing the output is displayed. |
41996
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
2093 |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
2094 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
|
2095 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
|
2096 of the output. |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
2097 |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
2098 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
|
2099 then `*Shell Command Output*' is deleted. |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
2100 |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2101 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
|
2102 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
|
2103 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
|
2104 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
|
2105 specifies the value of ERROR-BUFFER." |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2106 |
94251
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2107 (interactive |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2108 (list |
97150
9718b5cb3616
(read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents:
97128
diff
changeset
|
2109 (read-shell-command "Shell command: " nil nil |
9718b5cb3616
(read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents:
97128
diff
changeset
|
2110 (and buffer-file-name |
9718b5cb3616
(read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents:
97128
diff
changeset
|
2111 (file-relative-name buffer-file-name))) |
94251
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2112 current-prefix-arg |
5e8b311c9c8e
(minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents:
94215
diff
changeset
|
2113 shell-command-default-error-buffer)) |
14627
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2114 ;; 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
|
2115 (let ((handler |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2116 (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
|
2117 'shell-command))) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2118 (if handler |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2119 (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
|
2120 (if (and output-buffer |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2121 (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
|
2122 ;; Output goes in current buffer. |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2123 (let ((error-file |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2124 (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
|
2125 (make-temp-file |
25483
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
2126 (expand-file-name "scor" |
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
2127 (or small-temporary-file-directory |
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
2128 temporary-file-directory))) |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2129 nil))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2130 (barf-if-buffer-read-only) |
24825
f88179cfae99
(shell-command): Avoid printing "mark set" message.
Karl Heuer <kwzh@gnu.org>
parents:
24814
diff
changeset
|
2131 (push-mark nil t) |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2132 ;; 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
|
2133 ;; .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
|
2134 ;; "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
|
2135 ;; 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
|
2136 ;; 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
|
2137 (call-process shell-file-name nil |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2138 (if error-file |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2139 (list t error-file) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2140 t) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2141 nil shell-command-switch command) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2142 (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
|
2143 (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
|
2144 (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
|
2145 (let ((pos-from-end (- (point-max) (point)))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2146 (or (bobp) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2147 (insert "\f\n")) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2148 ;; Do no formatting while reading error file, |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2149 ;; 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
|
2150 ;; 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
|
2151 (format-insert-file error-file nil) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2152 ;; Put point after the inserted errors. |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2153 (goto-char (- (point-max) pos-from-end))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2154 (display-buffer (current-buffer)))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2155 (delete-file error-file)) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2156 ;; 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
|
2157 ;; 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
|
2158 ;; 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
|
2159 ;; because we inserted text. |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2160 (goto-char (prog1 (mark t) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2161 (set-marker (mark-marker) (point) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2162 (current-buffer))))) |
41996
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
2163 ;; Output goes in a separate buffer. |
14627
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2164 ;; 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
|
2165 (save-match-data |
46026
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
2166 (if (string-match "[ \t]*&[ \t]*\\'" command) |
14627
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2167 ;; Command ending with ampersand means asynchronous. |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2168 (let ((buffer (get-buffer-create |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2169 (or output-buffer "*Async Shell Command*"))) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2170 (directory default-directory) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2171 proc) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2172 ;; Remove the ampersand. |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2173 (setq command (substring command 0 (match-beginning 0))) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2174 ;; If will kill a process, query first. |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2175 (setq proc (get-buffer-process buffer)) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2176 (if proc |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2177 (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
|
2178 (kill-process proc) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2179 (error "Shell command in progress"))) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
2180 (with-current-buffer buffer |
14627
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2181 (setq buffer-read-only nil) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2182 (erase-buffer) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2183 (display-buffer buffer) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2184 (setq default-directory directory) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2185 (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
|
2186 shell-command-switch command)) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2187 (setq mode-line-process '(":%s")) |
51026
8113316012c6
(shell-command): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50987
diff
changeset
|
2188 (require 'shell) (shell-mode) |
14627
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2189 (set-process-sentinel proc 'shell-command-sentinel) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
2190 )) |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2191 (shell-command-on-region (point) (point) command |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2192 output-buffer nil error-buffer))))))) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
2193 |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2194 (defun display-message-or-buffer (message |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2195 &optional buffer-name not-this-window frame) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2196 "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
|
2197 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
|
2198 |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2199 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
|
2200 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
|
2201 if `resize-mini-windows' is non-nil. |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2202 |
32260 | 2203 Returns either the string shown in the echo area, or when a pop-up |
2204 buffer is used, the window used to display it. | |
2205 | |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2206 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
|
2207 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
|
2208 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
|
2209 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
|
2210 the contents are inserted into the buffer anyway. |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2211 |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2212 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
|
2213 and only used if a buffer is displayed." |
76579
57d392645f54
Revert 2006-02-04 change by Kevin Rodgers due to lack of legal papers.
Chong Yidong <cyd@stupidchicken.com>
parents:
76513
diff
changeset
|
2214 (cond ((and (stringp message) (not (string-match "\n" message))) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2215 ;; 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
|
2216 (message "%s" message)) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2217 ((and (stringp message) |
76579
57d392645f54
Revert 2006-02-04 change by Kevin Rodgers due to lack of legal papers.
Chong Yidong <cyd@stupidchicken.com>
parents:
76513
diff
changeset
|
2218 (= (string-match "\n" message) (1- (length message)))) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2219 ;; 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
|
2220 (message "%s" (substring message 0 (1- (length message))))) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2221 (t |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2222 ;; General case |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2223 (with-current-buffer |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2224 (if (bufferp message) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2225 message |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2226 (get-buffer-create (or buffer-name "*Message*"))) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2227 |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2228 (unless (bufferp message) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2229 (erase-buffer) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2230 (insert message)) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2231 |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2232 (let ((lines |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2233 (if (= (buffer-size) 0) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2234 0 |
68611
28a6ea706763
(display-message-or-buffer): Count screen lines instead of buffer lines when
Eli Zaretskii <eliz@gnu.org>
parents:
68537
diff
changeset
|
2235 (count-screen-lines nil nil nil (minibuffer-window))))) |
48013
d3416b0f856c
(toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents:
47599
diff
changeset
|
2236 (cond ((= lines 0)) |
d3416b0f856c
(toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents:
47599
diff
changeset
|
2237 ((and (or (<= lines 1) |
46026
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
2238 (<= lines |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
2239 (if resize-mini-windows |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
2240 (cond ((floatp max-mini-window-height) |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
2241 (* (frame-height) |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
2242 max-mini-window-height)) |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
2243 ((integerp max-mini-window-height) |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
2244 max-mini-window-height) |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
2245 (t |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
2246 1)) |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
2247 1))) |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
2248 ;; Don't use the echo area if the output buffer is |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
2249 ;; already dispayed in the selected frame. |
46090
f52b57f5e2a4
(display-message-or-buffer): Fix last change.
Andreas Schwab <schwab@suse.de>
parents:
46088
diff
changeset
|
2250 (not (get-buffer-window (current-buffer)))) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2251 ;; Echo area |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2252 (goto-char (point-max)) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2253 (when (bolp) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2254 (backward-char 1)) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2255 (message "%s" (buffer-substring (point-min) (point)))) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2256 (t |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2257 ;; Buffer |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2258 (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
|
2259 (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
|
2260 not-this-window frame)))))))) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2261 |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2262 |
475 | 2263 ;; We have a sentinel to prevent insertion of a termination message |
2264 ;; in the buffer itself. | |
2265 (defun shell-command-sentinel (process signal) | |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2266 (if (memq (process-status process) '(exit signal)) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2267 (message "%s: %s." |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2268 (car (cdr (cdr (process-command process)))) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
2269 (substring signal 0 -1)))) |
475 | 2270 |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
2271 (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
|
2272 &optional output-buffer replace |
56761
486136b7f89c
(shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents:
56613
diff
changeset
|
2273 error-buffer display-error-buffer) |
475 | 2274 "Execute string COMMAND in inferior shell with region as input. |
2275 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
|
2276 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
|
2277 COMMAND. |
10852
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
2278 |
19109
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
2279 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
|
2280 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
|
2281 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
|
2282 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
|
2283 `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
|
2284 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
|
2285 |
56761
486136b7f89c
(shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents:
56613
diff
changeset
|
2286 The noninteractive arguments are START, END, COMMAND, |
486136b7f89c
(shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents:
56613
diff
changeset
|
2287 OUTPUT-BUFFER, REPLACE, ERROR-BUFFER, and DISPLAY-ERROR-BUFFER. |
486136b7f89c
(shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents:
56613
diff
changeset
|
2288 Noninteractive callers can specify coding systems by binding |
486136b7f89c
(shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents:
56613
diff
changeset
|
2289 `coding-system-for-read' and `coding-system-for-write'. |
475 | 2290 |
41996
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
2291 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
|
2292 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
|
2293 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
|
2294 \(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
|
2295 `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
|
2296 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
|
2297 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
|
2298 |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
2299 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
|
2300 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
|
2301 |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
2302 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
|
2303 then `*Shell Command Output*' is deleted. |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
2304 |
10852
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
2305 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
|
2306 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
|
2307 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
|
2308 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
|
2309 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
|
2310 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
|
2311 |
23471
b6dbbd2cc3ac
(shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23450
diff
changeset
|
2312 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
|
2313 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
|
2314 around it. |
b6dbbd2cc3ac
(shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23450
diff
changeset
|
2315 |
23588
cec6b3f8f355
(shell-command-on-region): Doc fix.
Andreas Schwab <schwab@suse.de>
parents:
23520
diff
changeset
|
2316 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
|
2317 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
|
2318 If it is nil, error output is mingled with regular output. |
56761
486136b7f89c
(shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents:
56613
diff
changeset
|
2319 If DISPLAY-ERROR-BUFFER is non-nil, display the error buffer if there |
486136b7f89c
(shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents:
56613
diff
changeset
|
2320 were any errors. (This is always t, interactively.) |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2321 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
|
2322 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
|
2323 (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
|
2324 (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
|
2325 (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
|
2326 ;; 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
|
2327 ;; 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
|
2328 ;; relocates them while we are in the minibuffer. |
93112
6ed43e8a395c
(minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93011
diff
changeset
|
2329 (setq string (read-shell-command "Shell command on region: ")) |
13482
e49cd471ced7
(do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13328
diff
changeset
|
2330 ;; call-interactively recognizes region-beginning and |
e49cd471ced7
(do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13328
diff
changeset
|
2331 ;; 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
|
2332 (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
|
2333 string |
7b7874738e7c
(shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents:
10779
diff
changeset
|
2334 current-prefix-arg |
24106
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2335 current-prefix-arg |
56761
486136b7f89c
(shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents:
56613
diff
changeset
|
2336 shell-command-default-error-buffer |
486136b7f89c
(shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents:
56613
diff
changeset
|
2337 t))) |
19362
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
2338 (let ((error-file |
25483
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
2339 (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
|
2340 (make-temp-file |
25483
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
2341 (expand-file-name "scor" |
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
2342 (or small-temporary-file-directory |
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
2343 temporary-file-directory))) |
24155
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2344 nil)) |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2345 exit-status) |
24106
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2346 (if (or replace |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2347 (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
|
2348 (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
|
2349 ;; 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
|
2350 (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
|
2351 ;; 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
|
2352 (goto-char start) |
43794
8acd1399d389
(shell-command-on-region): Call push-mark with
Eli Zaretskii <eliz@gnu.org>
parents:
43581
diff
changeset
|
2353 (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
|
2354 (setq exit-status |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2355 (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
|
2356 (if error-file |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2357 (list t error-file) |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2358 t) |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2359 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
|
2360 ;; 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
|
2361 ;; (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
|
2362 ;; (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
|
2363 ;; (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
|
2364 ;; 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
|
2365 (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
|
2366 ;; 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
|
2367 ;; replacing its entire contents. |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2368 (let ((buffer (get-buffer-create |
46088
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2369 (or output-buffer "*Shell Command Output*")))) |
24106
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2370 (unwind-protect |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2371 (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
|
2372 ;; 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
|
2373 ;; 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
|
2374 ;; 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
|
2375 (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
|
2376 (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
|
2377 (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
|
2378 (setq exit-status |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2379 (call-process-region (point-min) (point-max) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2380 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
|
2381 (if error-file |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2382 (list t error-file) |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2383 t) |
24155
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2384 nil shell-command-switch |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2385 command))) |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2386 ;; 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
|
2387 ;; output there. |
28703
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
2388 (let ((directory default-directory)) |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
2389 (save-excursion |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
2390 (set-buffer buffer) |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
2391 (setq buffer-read-only nil) |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
2392 (if (not output-buffer) |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
2393 (setq default-directory directory)) |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
2394 (erase-buffer))) |
24106
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2395 (setq exit-status |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2396 (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
|
2397 (if error-file |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2398 (list buffer error-file) |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2399 buffer) |
24155
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2400 nil shell-command-switch command))) |
41996
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
2401 ;; Report the output. |
43581
d7536b0977ac
(shell-command-on-region): Report non-zero exit
Kim F. Storm <storm@cua.dk>
parents:
43436
diff
changeset
|
2402 (with-current-buffer buffer |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49585
diff
changeset
|
2403 (setq mode-line-process |
46088
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2404 (cond ((null exit-status) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2405 " - Error") |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2406 ((stringp exit-status) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2407 (format " - Signal [%s]" exit-status)) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2408 ((not (equal 0 exit-status)) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2409 (format " - Exit [%d]" exit-status))))) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2410 (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
|
2411 ;; 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
|
2412 (display-message-or-buffer buffer) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2413 ;; 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
|
2414 (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
|
2415 (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
|
2416 (< 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
|
2417 "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
|
2418 "no output"))) |
46088
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2419 (cond ((null exit-status) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2420 (message "(Shell command failed with error)")) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2421 ((equal 0 exit-status) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2422 (message "(Shell command succeeded with %s)" |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2423 output)) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2424 ((stringp exit-status) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2425 (message "(Shell command killed by signal %s)" |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2426 exit-status)) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2427 (t |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2428 (message "(Shell command failed with code %d and %s)" |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2429 exit-status output)))) |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2430 ;; 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
|
2431 ;; (kill-buffer buffer) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2432 )))) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2433 |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2434 (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
|
2435 (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
|
2436 (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
|
2437 (let ((pos-from-end (- (point-max) (point)))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2438 (or (bobp) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2439 (insert "\f\n")) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2440 ;; Do no formatting while reading error file, |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2441 ;; 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
|
2442 ;; 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
|
2443 (format-insert-file error-file nil) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2444 ;; Put point after the inserted errors. |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2445 (goto-char (- (point-max) pos-from-end))) |
56761
486136b7f89c
(shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents:
56613
diff
changeset
|
2446 (and display-error-buffer |
486136b7f89c
(shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents:
56613
diff
changeset
|
2447 (display-buffer (current-buffer))))) |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2448 (delete-file error-file)) |
24155
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2449 exit-status)) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2450 |
16312
20690a1ec100
(shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16018
diff
changeset
|
2451 (defun shell-command-to-string (command) |
20690a1ec100
(shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16018
diff
changeset
|
2452 "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
|
2453 (with-output-to-string |
16316
50be5f6cb5e6
(shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents:
16312
diff
changeset
|
2454 (with-current-buffer |
50be5f6cb5e6
(shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents:
16312
diff
changeset
|
2455 standard-output |
50be5f6cb5e6
(shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents:
16312
diff
changeset
|
2456 (call-process shell-file-name nil t nil shell-command-switch command)))) |
57653
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2457 |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2458 (defun process-file (program &optional infile buffer display &rest args) |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2459 "Process files synchronously in a separate process. |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2460 Similar to `call-process', but may invoke a file handler based on |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2461 `default-directory'. The current working directory of the |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2462 subprocess is `default-directory'. |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2463 |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2464 File names in INFILE and BUFFER are handled normally, but file |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2465 names in ARGS should be relative to `default-directory', as they |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2466 are passed to the process verbatim. \(This is a difference to |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2467 `call-process' which does not support file handlers for INFILE |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2468 and BUFFER.\) |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2469 |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2470 Some file handlers might not support all variants, for example |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2471 they might behave as if DISPLAY was nil, regardless of the actual |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2472 value passed." |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2473 (let ((fh (find-file-name-handler default-directory 'process-file)) |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2474 lc stderr-file) |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2475 (unwind-protect |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2476 (if fh (apply fh 'process-file program infile buffer display args) |
57668
d9dc84198059
(process-file): Accept nil for INFILE. Reported by
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57653
diff
changeset
|
2477 (when infile (setq lc (file-local-copy infile))) |
57653
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2478 (setq stderr-file (when (and (consp buffer) (stringp (cadr buffer))) |
57688
4d4bfb9781e1
(process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57668
diff
changeset
|
2479 (make-temp-file "emacs"))) |
4d4bfb9781e1
(process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57668
diff
changeset
|
2480 (prog1 |
4d4bfb9781e1
(process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57668
diff
changeset
|
2481 (apply 'call-process program |
4d4bfb9781e1
(process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57668
diff
changeset
|
2482 (or lc infile) |
4d4bfb9781e1
(process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57668
diff
changeset
|
2483 (if stderr-file (list (car buffer) stderr-file) buffer) |
4d4bfb9781e1
(process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57668
diff
changeset
|
2484 display args) |
4d4bfb9781e1
(process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57668
diff
changeset
|
2485 (when stderr-file (copy-file stderr-file (cadr buffer))))) |
57653
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2486 (when stderr-file (delete-file stderr-file)) |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2487 (when lc (delete-file lc))))) |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2488 |
81736
d50de52ebdfb
* simple.el (start-file-process): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
81666
diff
changeset
|
2489 (defun start-file-process (name buffer program &rest program-args) |
d50de52ebdfb
* simple.el (start-file-process): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
81666
diff
changeset
|
2490 "Start a program in a subprocess. Return the process object for it. |
94808
8b60ad9b42c3
* simple.el (start-file-process): Clarify docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
94678
diff
changeset
|
2491 |
81736
d50de52ebdfb
* simple.el (start-file-process): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
81666
diff
changeset
|
2492 Similar to `start-process', but may invoke a file handler based on |
94808
8b60ad9b42c3
* simple.el (start-file-process): Clarify docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
94678
diff
changeset
|
2493 `default-directory'. See Info node `(elisp)Magic File Names'. |
8b60ad9b42c3
* simple.el (start-file-process): Clarify docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
94678
diff
changeset
|
2494 |
8b60ad9b42c3
* simple.el (start-file-process): Clarify docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
94678
diff
changeset
|
2495 This handler ought to run PROGRAM, perhaps on the local host, |
8b60ad9b42c3
* simple.el (start-file-process): Clarify docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
94678
diff
changeset
|
2496 perhaps on a remote host that corresponds to `default-directory'. |
8b60ad9b42c3
* simple.el (start-file-process): Clarify docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
94678
diff
changeset
|
2497 In the latter case, the local part of `default-directory' becomes |
8b60ad9b42c3
* simple.el (start-file-process): Clarify docstring.
Michael Albinus <michael.albinus@gmx.de>
parents:
94678
diff
changeset
|
2498 the working directory of the process. |
81736
d50de52ebdfb
* simple.el (start-file-process): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
81666
diff
changeset
|
2499 |
d50de52ebdfb
* simple.el (start-file-process): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
81666
diff
changeset
|
2500 PROGRAM and PROGRAM-ARGS might be file names. They are not |
d50de52ebdfb
* simple.el (start-file-process): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
81666
diff
changeset
|
2501 objects of file handler invocation." |
d50de52ebdfb
* simple.el (start-file-process): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
81666
diff
changeset
|
2502 (let ((fh (find-file-name-handler default-directory 'start-file-process))) |
d50de52ebdfb
* simple.el (start-file-process): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
81666
diff
changeset
|
2503 (if fh (apply fh 'start-file-process name buffer program program-args) |
d50de52ebdfb
* simple.el (start-file-process): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
81666
diff
changeset
|
2504 (apply 'start-process name buffer program program-args)))) |
d50de52ebdfb
* simple.el (start-file-process): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
81666
diff
changeset
|
2505 |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
2506 |
16685
26919ad3a4ad
Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16632
diff
changeset
|
2507 (defvar universal-argument-map |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2508 (let ((map (make-sparse-keymap))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2509 (define-key map [t] 'universal-argument-other-key) |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
2510 (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
|
2511 (define-key map [switch-frame] nil) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2512 (define-key map [?\C-u] 'universal-argument-more) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2513 (define-key map [?-] 'universal-argument-minus) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2514 (define-key map [?0] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2515 (define-key map [?1] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2516 (define-key map [?2] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2517 (define-key map [?3] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2518 (define-key map [?4] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2519 (define-key map [?5] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2520 (define-key map [?6] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2521 (define-key map [?7] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2522 (define-key map [?8] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2523 (define-key map [?9] 'digit-argument) |
30347
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2524 (define-key map [kp-0] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2525 (define-key map [kp-1] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2526 (define-key map [kp-2] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2527 (define-key map [kp-3] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2528 (define-key map [kp-4] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2529 (define-key map [kp-5] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2530 (define-key map [kp-6] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2531 (define-key map [kp-7] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2532 (define-key map [kp-8] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2533 (define-key map [kp-9] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2534 (define-key map [kp-subtract] 'universal-argument-minus) |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2535 map) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2536 "Keymap used while processing \\[universal-argument].") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2537 |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2538 (defvar universal-argument-num-events nil |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2539 "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
|
2540 `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
|
2541 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
|
2542 |
52966
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2543 (defvar overriding-map-is-bound nil |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2544 "Non-nil when `overriding-terminal-local-map' is `universal-argument-map'.") |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2545 |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2546 (defvar saved-overriding-map nil |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2547 "The saved value of `overriding-terminal-local-map'. |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2548 That variable gets restored to this value on exiting \"universal |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2549 argument mode\".") |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2550 |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2551 (defun ensure-overriding-map-is-bound () |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2552 "Check `overriding-terminal-local-map' is `universal-argument-map'." |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2553 (unless overriding-map-is-bound |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2554 (setq saved-overriding-map overriding-terminal-local-map) |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2555 (setq overriding-terminal-local-map universal-argument-map) |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2556 (setq overriding-map-is-bound t))) |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2557 |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2558 (defun restore-overriding-map () |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2559 "Restore `overriding-terminal-local-map' to its saved value." |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2560 (setq overriding-terminal-local-map saved-overriding-map) |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2561 (setq overriding-map-is-bound nil)) |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2562 |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
2563 (defun universal-argument () |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
2564 "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
|
2565 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
|
2566 \\[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
|
2567 \\[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
|
2568 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
|
2569 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
|
2570 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
|
2571 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
|
2572 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
|
2573 (interactive) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2574 (setq prefix-arg (list 4)) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2575 (setq universal-argument-num-events (length (this-command-keys))) |
52966
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2576 (ensure-overriding-map-is-bound)) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
2577 |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2578 ;; 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
|
2579 ;; 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
|
2580 (defun universal-argument-more (arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2581 (interactive "P") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2582 (if (consp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2583 (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
|
2584 (if (eq arg '-) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
2585 (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
|
2586 (setq prefix-arg arg) |
52966
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2587 (restore-overriding-map))) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2588 (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
|
2589 |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2590 (defun negative-argument (arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2591 "Begin a negative numeric argument for the next command. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2592 \\[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
|
2593 (interactive "P") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2594 (cond ((integerp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2595 (setq prefix-arg (- arg))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2596 ((eq arg '-) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2597 (setq prefix-arg nil)) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2598 (t |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
2599 (setq prefix-arg '-))) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2600 (setq universal-argument-num-events (length (this-command-keys))) |
52966
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2601 (ensure-overriding-map-is-bound)) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
2602 |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
2603 (defun digit-argument (arg) |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
2604 "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
|
2605 \\[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
|
2606 (interactive "P") |
101010
4efc7ca085ce
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2607 (let* ((char (if (integerp last-command-event) |
4efc7ca085ce
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2608 last-command-event |
4efc7ca085ce
Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
2609 (get last-command-event 'ascii-character))) |
30347
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2610 (digit (- (logand char ?\177) ?0))) |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2611 (cond ((integerp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2612 (setq prefix-arg (+ (* arg 10) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2613 (if (< arg 0) (- digit) digit)))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2614 ((eq arg '-) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2615 ;; Treat -0 as just -, so that -01 will work. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2616 (setq prefix-arg (if (zerop digit) '- (- digit)))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2617 (t |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
2618 (setq prefix-arg digit)))) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2619 (setq universal-argument-num-events (length (this-command-keys))) |
52966
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2620 (ensure-overriding-map-is-bound)) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
2621 |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2622 ;; 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
|
2623 ;; command if digits have already been entered. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2624 (defun universal-argument-minus (arg) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
2625 (interactive "P") |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2626 (if (integerp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2627 (universal-argument-other-key arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2628 (negative-argument arg))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2629 |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2630 ;; 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
|
2631 ;; executed as a command. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2632 (defun universal-argument-other-key (arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2633 (interactive "P") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2634 (setq prefix-arg arg) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2635 (let* ((key (this-command-keys)) |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2636 (keylist (listify-key-sequence key))) |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2637 (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
|
2638 (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
|
2639 unread-command-events))) |
12320
979836b1a1a9
(universal-argument-other-key): Call reset-this-command-lengths.
Richard M. Stallman <rms@gnu.org>
parents:
12313
diff
changeset
|
2640 (reset-this-command-lengths) |
52966
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2641 (restore-overriding-map)) |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
2642 |
61111
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2643 (defvar buffer-substring-filters nil |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2644 "List of filter functions for `filter-buffer-substring'. |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2645 Each function must accept a single argument, a string, and return |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2646 a string. The buffer substring is passed to the first function |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2647 in the list, and the return value of each function is passed to |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2648 the next. The return value of the last function is used as the |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2649 return value of `filter-buffer-substring'. |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2650 |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2651 If this variable is nil, no filtering is performed.") |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2652 |
69899
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2653 (defun filter-buffer-substring (beg end &optional delete noprops) |
61111
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2654 "Return the buffer substring between BEG and END, after filtering. |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2655 The buffer substring is passed through each of the filter |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2656 functions in `buffer-substring-filters', and the value from the |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2657 last filter function is returned. If `buffer-substring-filters' |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2658 is nil, the buffer substring is returned unaltered. |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2659 |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2660 If DELETE is non-nil, the text between BEG and END is deleted |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2661 from the buffer. |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2662 |
69899
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2663 If NOPROPS is non-nil, final string returned does not include |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2664 text properties, while the string passed to the filters still |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2665 includes text properties from the buffer text. |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2666 |
62919
038ca3b7ba0d
(filter-buffer-substring): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62739
diff
changeset
|
2667 Point is temporarily set to BEG before calling |
61111
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2668 `buffer-substring-filters', in case the functions need to know |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2669 where the text came from. |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2670 |
69899
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2671 This function should be used instead of `buffer-substring', |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2672 `buffer-substring-no-properties', or `delete-and-extract-region' |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2673 when you want to allow filtering to take place. For example, |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2674 major or minor modes can use `buffer-substring-filters' to |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2675 extract characters that are special to a buffer, and should not |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2676 be copied into other buffers." |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2677 (cond |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2678 ((or delete buffer-substring-filters) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2679 (save-excursion |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2680 (goto-char beg) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2681 (let ((string (if delete (delete-and-extract-region beg end) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2682 (buffer-substring beg end)))) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2683 (dolist (filter buffer-substring-filters) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2684 (setq string (funcall filter string))) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2685 (if noprops |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2686 (set-text-properties 0 (length string) nil string)) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2687 string))) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2688 (noprops |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2689 (buffer-substring-no-properties beg end)) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2690 (t |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2691 (buffer-substring beg end)))) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2692 |
61111
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2693 |
715 | 2694 ;;;; Window system cut and paste hooks. |
2695 | |
2696 (defvar interprogram-cut-function nil | |
2697 "Function to call to make a killed region available to other programs. | |
2698 | |
2699 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
|
2700 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
|
2701 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
|
2702 is put in the kill ring, to make the new kill available to other |
715 | 2703 programs. |
2704 | |
3034
dd65780e6246
(kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents:
3029
diff
changeset
|
2705 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
|
2706 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
|
2707 the text which should be made available. |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2708 The second, optional, argument PUSH, has the same meaning as the |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2709 similar argument to `x-set-cut-buffer', which see.") |
715 | 2710 |
2711 (defvar interprogram-paste-function nil | |
2712 "Function to call to get text cut from other programs. | |
2713 | |
2714 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
|
2715 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
|
2716 This variable holds a function that Emacs calls to obtain |
715 | 2717 text that other programs have provided for pasting. |
2718 | |
2719 The function should be called with no arguments. If the function | |
2720 returns nil, then no other program has provided such text, and the top | |
2721 of the Emacs kill ring should be used. If the function returns a | |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2722 string, then the caller of the function \(usually `current-kill') |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2723 should put this string in the kill ring as the latest kill. |
727 | 2724 |
85397
1404d7fefc24
Tom Horsley <tom.horsley at att.net>
Glenn Morris <rgm@gnu.org>
parents:
85327
diff
changeset
|
2725 This function may also return a list of strings if the window |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
2726 system supports multiple selections. The first string will be |
85397
1404d7fefc24
Tom Horsley <tom.horsley at att.net>
Glenn Morris <rgm@gnu.org>
parents:
85327
diff
changeset
|
2727 used as the pasted text, but the other will be placed in the |
1404d7fefc24
Tom Horsley <tom.horsley at att.net>
Glenn Morris <rgm@gnu.org>
parents:
85327
diff
changeset
|
2728 kill ring for easy access via `yank-pop'. |
1404d7fefc24
Tom Horsley <tom.horsley at att.net>
Glenn Morris <rgm@gnu.org>
parents:
85327
diff
changeset
|
2729 |
727 | 2730 Note that the function should return a string only if a program other |
2731 than Emacs has provided a string for pasting; if Emacs provided the | |
2732 most recent string, the function should return nil. If it is | |
2733 difficult to tell whether Emacs or some other program provided the | |
2734 current string, it is probably good enough to return nil if the string | |
2735 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
|
2736 |
715 | 2737 |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
2738 |
715 | 2739 ;;;; The kill ring data structure. |
475 | 2740 |
2741 (defvar kill-ring nil | |
715 | 2742 "List of killed text sequences. |
2743 Since the kill ring is supposed to interact nicely with cut-and-paste | |
2744 facilities offered by window systems, use of this variable should | |
2745 interact nicely with `interprogram-cut-function' and | |
2746 `interprogram-paste-function'. The functions `kill-new', | |
2747 `kill-append', and `current-kill' are supposed to implement this | |
2748 interaction; you may want to use them instead of manipulating the kill | |
2749 ring directly.") | |
475 | 2750 |
23495
d5f08ad9a40b
(kill-ring-max): Increased to 60.
Richard M. Stallman <rms@gnu.org>
parents:
23491
diff
changeset
|
2751 (defcustom kill-ring-max 60 |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
2752 "Maximum length of kill ring before oldest elements are thrown away." |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2753 :type 'integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2754 :group 'killing) |
475 | 2755 |
2756 (defvar kill-ring-yank-pointer nil | |
2757 "The tail of the kill ring whose car is the last thing yanked.") | |
2758 | |
49309
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2759 (defun kill-new (string &optional replace yank-handler) |
715 | 2760 "Make STRING the latest kill in the kill ring. |
44273 | 2761 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
|
2762 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
|
2763 Optional second argument REPLACE non-nil means that STRING will replace |
49309
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2764 the front of the kill ring, rather than being added to the list. |
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2765 |
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2766 Optional third arguments YANK-HANDLER controls how the STRING is later |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49585
diff
changeset
|
2767 inserted into a buffer; see `insert-for-yank' for details. |
49491
c52c622747ca
(kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49364
diff
changeset
|
2768 When a yank handler is specified, STRING must be non-empty (the yank |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2769 handler, if non-nil, is stored as a `yank-handler' text property on STRING). |
49491
c52c622747ca
(kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49364
diff
changeset
|
2770 |
c52c622747ca
(kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49364
diff
changeset
|
2771 When the yank handler has a non-nil PARAM element, the original STRING |
c52c622747ca
(kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49364
diff
changeset
|
2772 argument is not used by `insert-for-yank'. However, since Lisp code |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
2773 may access and use elements from the kill ring directly, the STRING |
49491
c52c622747ca
(kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49364
diff
changeset
|
2774 argument should still be a \"useful\" string for such uses." |
c52c622747ca
(kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49364
diff
changeset
|
2775 (if (> (length string) 0) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49585
diff
changeset
|
2776 (if yank-handler |
53931
bfe6c29e5283
(kill-new): Put yank-handler property on the entire string.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53925
diff
changeset
|
2777 (put-text-property 0 (length string) |
bfe6c29e5283
(kill-new): Put yank-handler property on the entire string.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53925
diff
changeset
|
2778 'yank-handler yank-handler string)) |
49491
c52c622747ca
(kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49364
diff
changeset
|
2779 (if yank-handler |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49585
diff
changeset
|
2780 (signal 'args-out-of-range |
49491
c52c622747ca
(kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49364
diff
changeset
|
2781 (list string "yank-handler specified for empty string")))) |
c52c622747ca
(kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49364
diff
changeset
|
2782 (if (fboundp 'menu-bar-update-yank-menu) |
c52c622747ca
(kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49364
diff
changeset
|
2783 (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
|
2784 (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
|
2785 (setcar kill-ring string) |
66595
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
2786 (push string kill-ring) |
8763
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
2787 (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
|
2788 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil))) |
715 | 2789 (setq kill-ring-yank-pointer kill-ring) |
2790 (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
|
2791 (funcall interprogram-cut-function string (not replace)))) |
715 | 2792 |
49309
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2793 (defun kill-append (string before-p &optional yank-handler) |
715 | 2794 "Append STRING to the end of the latest kill in the kill ring. |
2795 If BEFORE-P is non-nil, prepend STRING to the kill. | |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2796 Optional third argument YANK-HANDLER, if non-nil, specifies the |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2797 yank-handler text property to be set on the combined kill ring |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2798 string. If the specified yank-handler arg differs from the |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2799 yank-handler property of the latest kill string, this function |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2800 adds the combined string to the kill ring as a new element, |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2801 instead of replacing the last kill with it. |
49309
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2802 If `interprogram-cut-function' is set, pass the resulting kill to it." |
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2803 (let* ((cur (car kill-ring))) |
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2804 (kill-new (if before-p (concat string cur) (concat cur string)) |
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2805 (or (= (length cur) 0) |
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2806 (equal yank-handler (get-text-property 0 'yank-handler cur))) |
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2807 yank-handler))) |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2808 |
87390
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2809 (defcustom yank-pop-change-selection nil |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2810 "If non-nil, rotating the kill ring changes the window system selection." |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2811 :type 'boolean |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2812 :group 'killing |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2813 :version "23.1") |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2814 |
715 | 2815 (defun current-kill (n &optional do-not-move) |
2816 "Rotate the yanking point by N places, and then return that kill. | |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
2817 If N is zero, `interprogram-paste-function' is set, and calling |
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
2818 it returns a string or list of strings, then that string (or |
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
2819 list) is added to the front of the kill ring and the string (or |
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
2820 first string in the list) is returned as the latest kill. |
87390
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2821 |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2822 If N is not zero, and if `yank-pop-change-selection' is |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2823 non-nil, use `interprogram-cut-function' to transfer the |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2824 kill at the new yank point into the window system selection. |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2825 |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2826 If optional arg DO-NOT-MOVE is non-nil, then don't actually |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2827 move the yanking point; just return the Nth kill forward." |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2828 |
715 | 2829 (let ((interprogram-paste (and (= n 0) |
2830 interprogram-paste-function | |
2831 (funcall interprogram-paste-function)))) | |
2832 (if interprogram-paste | |
2833 (progn | |
2834 ;; Disable the interprogram cut function when we add the new | |
2835 ;; text to the kill ring, so Emacs doesn't try to own the | |
2836 ;; selection, with identical text. | |
2837 (let ((interprogram-cut-function nil)) | |
85397
1404d7fefc24
Tom Horsley <tom.horsley at att.net>
Glenn Morris <rgm@gnu.org>
parents:
85327
diff
changeset
|
2838 (if (listp interprogram-paste) |
1404d7fefc24
Tom Horsley <tom.horsley at att.net>
Glenn Morris <rgm@gnu.org>
parents:
85327
diff
changeset
|
2839 (mapc 'kill-new (nreverse interprogram-paste)) |
1404d7fefc24
Tom Horsley <tom.horsley at att.net>
Glenn Morris <rgm@gnu.org>
parents:
85327
diff
changeset
|
2840 (kill-new interprogram-paste))) |
1404d7fefc24
Tom Horsley <tom.horsley at att.net>
Glenn Morris <rgm@gnu.org>
parents:
85327
diff
changeset
|
2841 (car kill-ring)) |
715 | 2842 (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
|
2843 (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
|
2844 (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
|
2845 (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
|
2846 kill-ring))) |
87390
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2847 (unless do-not-move |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2848 (setq kill-ring-yank-pointer ARGth-kill-element) |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2849 (when (and yank-pop-change-selection |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2850 (> n 0) |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2851 interprogram-cut-function) |
82e3843d4fa6
(yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87386
diff
changeset
|
2852 (funcall interprogram-cut-function (car ARGth-kill-element)))) |
715 | 2853 (car ARGth-kill-element))))) |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2854 |
715 | 2855 |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
2856 |
715 | 2857 ;;;; Commands for manipulating the kill ring. |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2858 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2859 (defcustom kill-read-only-ok nil |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
2860 "Non-nil means don't signal an error for killing read-only text." |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2861 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2862 :group 'killing) |
7063
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
2863 |
14507
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
2864 (put 'text-read-only 'error-conditions |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
2865 '(text-read-only buffer-read-only error)) |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
2866 (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
|
2867 |
49309
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2868 (defun kill-region (beg end &optional yank-handler) |
69382
743351204cc6
(kill-region, yank): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68829
diff
changeset
|
2869 "Kill (\"cut\") text between point and mark. |
743351204cc6
(kill-region, yank): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68829
diff
changeset
|
2870 This deletes the text from the buffer and saves it in the kill ring. |
475 | 2871 The command \\[yank] can retrieve it from there. |
95367
380e5a5c73ea
Docstring improvement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94808
diff
changeset
|
2872 \(If you want to save the region without killing it, use \\[kill-ring-save].) |
36110
116beb1b2fc7
(kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
36030
diff
changeset
|
2873 |
116beb1b2fc7
(kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
36030
diff
changeset
|
2874 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
|
2875 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
|
2876 |
1834
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
2877 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
|
2878 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
|
2879 you can use the killing commands to copy text from a read-only buffer. |
475 | 2880 |
2881 This is the primitive for programs to kill text (as opposed to deleting it). | |
55975
594a6cacebfe
(kill-region): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
55799
diff
changeset
|
2882 Supply two arguments, character positions indicating the stretch of text |
475 | 2883 to be killed. |
2884 Any command that calls this function is a \"kill command\". | |
2885 If the previous command was also a kill command, | |
2886 the text killed this time appends to the text killed last time | |
49309
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2887 to make one entry in the kill ring. |
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2888 |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2889 In Lisp code, optional third arg YANK-HANDLER, if non-nil, |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2890 specifies the yank-handler text property to be set on the killed |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2891 text. See `insert-for-yank'." |
70826
d3fec44f2362
(kill-region): Interactively, pass point, then mark.
Richard M. Stallman <rms@gnu.org>
parents:
70623
diff
changeset
|
2892 ;; Pass point first, then mark, because the order matters |
d3fec44f2362
(kill-region): Interactively, pass point, then mark.
Richard M. Stallman <rms@gnu.org>
parents:
70623
diff
changeset
|
2893 ;; when calling kill-append. |
d3fec44f2362
(kill-region): Interactively, pass point, then mark.
Richard M. Stallman <rms@gnu.org>
parents:
70623
diff
changeset
|
2894 (interactive (list (point) (mark))) |
72638
abebf4e18f10
(kill-region): Explicitly test there is a region.
Richard M. Stallman <rms@gnu.org>
parents:
72451
diff
changeset
|
2895 (unless (and beg end) |
abebf4e18f10
(kill-region): Explicitly test there is a region.
Richard M. Stallman <rms@gnu.org>
parents:
72451
diff
changeset
|
2896 (error "The mark is not set now, so there is no region")) |
20279
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
2897 (condition-case nil |
61111
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2898 (let ((string (filter-buffer-substring beg end t))) |
26744
f14026cd9767
(kill-region): Use the new `delete-and-extract-region'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
26723
diff
changeset
|
2899 (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
|
2900 ;; 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
|
2901 (if (eq last-command 'kill-region) |
49309
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2902 (kill-append string (< end beg) yank-handler) |
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2903 (kill-new string nil yank-handler))) |
51304
955ff3c53a87
(kill-region): If nothing was killed, and the
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51220
diff
changeset
|
2904 (when (or string (eq last-command 'kill-region)) |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2905 (setq this-command 'kill-region)) |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2906 nil) |
20279
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
2907 ((buffer-read-only text-read-only) |
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
2908 ;; 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
|
2909 ;; in the region, are read-only. |
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
2910 ;; 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
|
2911 ;; However, there's no harm in putting |
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
2912 ;; 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
|
2913 (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
|
2914 ;; 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
|
2915 (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
|
2916 ;; 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
|
2917 (if kill-read-only-ok |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2918 (progn (message "Read only text copied to kill ring") nil) |
20279
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
2919 ;; 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
|
2920 (barf-if-buffer-read-only) |
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
2921 ;; 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
|
2922 (signal 'text-read-only (list (current-buffer))))))) |
475 | 2923 |
9876
75ecf866cfb8
Comment reason for preceding change.
Karl Heuer <kwzh@gnu.org>
parents:
9870
diff
changeset
|
2924 ;; 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
|
2925 ;; 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
|
2926 ;; then corrects it with the intended C-w. |
475 | 2927 (defun copy-region-as-kill (beg end) |
2928 "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
|
2929 In Transient Mark mode, deactivate the mark. |
617 | 2930 If `interprogram-cut-function' is non-nil, also save the text for a window |
84812
b3ee425c3884
(copy-region-as-kill): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
84609
diff
changeset
|
2931 system cut and paste. |
b3ee425c3884
(copy-region-as-kill): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
84609
diff
changeset
|
2932 |
b3ee425c3884
(copy-region-as-kill): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
84609
diff
changeset
|
2933 This command's old key binding has been given to `kill-ring-save'." |
475 | 2934 (interactive "r") |
2935 (if (eq last-command 'kill-region) | |
61111
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2936 (kill-append (filter-buffer-substring beg end) (< end beg)) |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2937 (kill-new (filter-buffer-substring beg end))) |
93561
e39e5bb86d6b
(beginning-of-buffer, end-of-buffer, goto-line, undo)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93548
diff
changeset
|
2938 (setq deactivate-mark t) |
475 | 2939 nil) |
2940 | |
2941 (defun kill-ring-save (beg end) | |
2111
d38d32084c15
* simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2075
diff
changeset
|
2942 "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
|
2943 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
|
2944 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
|
2945 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
|
2946 |
36110
116beb1b2fc7
(kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
36030
diff
changeset
|
2947 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
|
2948 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
|
2949 |
3467
002945794814
(kill-ring-save): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
3408
diff
changeset
|
2950 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
|
2951 visual feedback indicating the extent of the region being copied." |
475 | 2952 (interactive "r") |
2953 (copy-region-as-kill beg end) | |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
2954 ;; This use of interactive-p is correct |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
2955 ;; because the code it controls just gives the user visual feedback. |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
2956 (if (interactive-p) |
2850
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2957 (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
|
2958 (opoint (point)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2959 ;; 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
|
2960 ;; 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
|
2961 (inhibit-quit t)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2962 (if (pos-visible-in-window-p other-end (selected-window)) |
93561
e39e5bb86d6b
(beginning-of-buffer, end-of-buffer, goto-line, undo)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93548
diff
changeset
|
2963 ;; Swap point-and-mark quickly so as to show the region that |
e39e5bb86d6b
(beginning-of-buffer, end-of-buffer, goto-line, undo)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93548
diff
changeset
|
2964 ;; was selected. Don't do it if the region is highlighted. |
e39e5bb86d6b
(beginning-of-buffer, end-of-buffer, goto-line, undo)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93548
diff
changeset
|
2965 (unless (and (region-active-p) |
55262
49e42dd581dd
(kill-ring-save): If region face background color is
Kim F. Storm <storm@cua.dk>
parents:
55177
diff
changeset
|
2966 (face-background 'region)) |
2850
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2967 ;; Swap point and mark. |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2968 (set-marker (mark-marker) (point) (current-buffer)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2969 (goto-char other-end) |
55177
144273ac799a
(kill-ring-save): Use blink-matching-delay instead of the constant value 1.
Juri Linkov <juri@jurta.org>
parents:
55087
diff
changeset
|
2970 (sit-for blink-matching-delay) |
2850
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2971 ;; Swap back. |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2972 (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
|
2973 (goto-char opoint) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2974 ;; If user quit, deactivate the mark |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2975 ;; 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
|
2976 (and quit-flag mark-active |
4287
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
2977 (deactivate-mark))) |
2850
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2978 (let* ((killed-text (current-kill 0)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2979 (message-len (min (length killed-text) 40))) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2980 (if (= (point) beg) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2981 ;; Don't say "killed"; that is misleading. |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2982 (message "Saved text until \"%s\"" |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2983 (substring killed-text (- message-len))) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2984 (message "Saved text from \"%s\"" |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2985 (substring killed-text 0 message-len)))))))) |
475 | 2986 |
24798
6fe40d35360e
(append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents:
24789
diff
changeset
|
2987 (defun append-next-kill (&optional interactive) |
6fe40d35360e
(append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents:
24789
diff
changeset
|
2988 "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
|
2989 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
|
2990 (interactive "p") |
6fe40d35360e
(append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents:
24789
diff
changeset
|
2991 ;; 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
|
2992 (if interactive |
475 | 2993 (progn |
2994 (setq this-command 'kill-region) | |
2995 (message "If the next command is a kill, it will append")) | |
2996 (setq last-command 'kill-region))) | |
44667
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
2997 |
25292 | 2998 ;; Yanking. |
475 | 2999 |
44667
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
3000 ;; 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
|
3001 (defcustom yank-excluded-properties |
49309
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
3002 '(read-only invisible intangible field mouse-face help-echo local-map keymap |
73101
b584d304b053
(next-error-highlight, next-error-highlight-no-select): Default to 0.5.
Richard M. Stallman <rms@gnu.org>
parents:
73014
diff
changeset
|
3003 yank-handler follow-link fontified) |
84609
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
3004 "Text properties to discard when yanking. |
51461
5bcd833ec510
(yank-excluded-properties): Expand documentation string.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51324
diff
changeset
|
3005 The value should be a list of text properties to discard or t, |
5bcd833ec510
(yank-excluded-properties): Expand documentation string.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51324
diff
changeset
|
3006 which means to discard all text properties." |
44667
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
3007 :type '(choice (const :tag "All" t) (repeat symbol)) |
56005
54d79ab53dd3
(eval-expression-print-format): Don't print additional
Juri Linkov <juri@jurta.org>
parents:
55975
diff
changeset
|
3008 :group 'killing |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59790
diff
changeset
|
3009 :version "22.1") |
44667
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
3010 |
48583
150e7a54d970
(yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
48406
diff
changeset
|
3011 (defvar yank-window-start nil) |
49309
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
3012 (defvar yank-undo-function nil |
49364 | 3013 "If non-nil, function used by `yank-pop' to delete last stretch of yanked text. |
3014 Function is called with two parameters, START and END corresponding to | |
3015 the value of the mark and point; it is guaranteed that START <= END. | |
3016 Normally set from the UNDO element of a yank-handler; see `insert-for-yank'.") | |
48583
150e7a54d970
(yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
48406
diff
changeset
|
3017 |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
3018 (defun yank-pop (&optional arg) |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
3019 "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
|
3020 This command is allowed only immediately after a `yank' or a `yank-pop'. |
475 | 3021 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
|
3022 previously-killed text. `yank-pop' deletes that text and inserts in its |
475 | 3023 place a different stretch of killed text. |
3024 | |
3025 With no argument, the previous kill is inserted. | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
3026 With argument N, insert the Nth previous kill. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
3027 If N is negative, this is a more recent kill. |
475 | 3028 |
3029 The sequence of kills wraps around, so that after the oldest one | |
62632
71a259bf6342
(yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents:
62179
diff
changeset
|
3030 comes the newest one. |
71a259bf6342
(yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents:
62179
diff
changeset
|
3031 |
71a259bf6342
(yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents:
62179
diff
changeset
|
3032 When this command inserts killed text into the buffer, it honors |
71a259bf6342
(yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents:
62179
diff
changeset
|
3033 `yank-excluded-properties' and `yank-handler' as described in the |
71a259bf6342
(yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents:
62179
diff
changeset
|
3034 doc string for `insert-for-yank-1', which see." |
475 | 3035 (interactive "*p") |
3036 (if (not (eq last-command 'yank)) | |
3037 (error "Previous command was not a yank")) | |
3038 (setq this-command 'yank) | |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
3039 (unless arg (setq arg 1)) |
14507
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
3040 (let ((inhibit-read-only t) |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
3041 (before (< (point) (mark t)))) |
49312
ebc6f47b202e
(yank-pop): Always call yank-undo-function with start <= end.
Kim F. Storm <storm@cua.dk>
parents:
49309
diff
changeset
|
3042 (if before |
ebc6f47b202e
(yank-pop): Always call yank-undo-function with start <= end.
Kim F. Storm <storm@cua.dk>
parents:
49309
diff
changeset
|
3043 (funcall (or yank-undo-function 'delete-region) (point) (mark t)) |
ebc6f47b202e
(yank-pop): Always call yank-undo-function with start <= end.
Kim F. Storm <storm@cua.dk>
parents:
49309
diff
changeset
|
3044 (funcall (or yank-undo-function 'delete-region) (mark t) (point))) |
49309
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
3045 (setq yank-undo-function nil) |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
3046 (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
|
3047 (insert-for-yank (current-kill arg)) |
48583
150e7a54d970
(yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
48406
diff
changeset
|
3048 ;; Set the window start back where it was in the yank command, |
150e7a54d970
(yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
48406
diff
changeset
|
3049 ;; if possible. |
150e7a54d970
(yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
48406
diff
changeset
|
3050 (set-window-start (selected-window) yank-window-start t) |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
3051 (if before |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
3052 ;; 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
|
3053 ;; 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
|
3054 ;; 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
|
3055 (goto-char (prog1 (mark t) |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
3056 (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
|
3057 nil) |
475 | 3058 |
3059 (defun yank (&optional arg) | |
69410
7f8930333b39
(yank): Fix typo in docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69396
diff
changeset
|
3060 "Reinsert (\"paste\") the last stretch of killed text. |
475 | 3061 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
|
3062 killed OR yanked. Put point at end, and set mark at beginning. |
47346
8287dca5eb2d
(what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47316
diff
changeset
|
3063 With just \\[universal-argument] as argument, same but put point at beginning (and mark at end). |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
3064 With argument N, reinsert the Nth most recently killed stretch of killed |
475 | 3065 text. |
62632
71a259bf6342
(yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents:
62179
diff
changeset
|
3066 |
71a259bf6342
(yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents:
62179
diff
changeset
|
3067 When this command inserts killed text into the buffer, it honors |
71a259bf6342
(yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents:
62179
diff
changeset
|
3068 `yank-excluded-properties' and `yank-handler' as described in the |
71a259bf6342
(yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents:
62179
diff
changeset
|
3069 doc string for `insert-for-yank-1', which see. |
71a259bf6342
(yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents:
62179
diff
changeset
|
3070 |
73605 | 3071 See also the command `yank-pop' (\\[yank-pop])." |
475 | 3072 (interactive "*P") |
48583
150e7a54d970
(yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
48406
diff
changeset
|
3073 (setq yank-window-start (window-start)) |
5935
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
3074 ;; 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
|
3075 ;; for the following command. |
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
3076 (setq this-command t) |
475 | 3077 (push-mark (point)) |
44667
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
3078 (insert-for-yank (current-kill (cond |
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
3079 ((listp arg) 0) |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
3080 ((eq arg '-) -2) |
44667
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
3081 (t (1- arg))))) |
475 | 3082 (if (consp arg) |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
3083 ;; 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
|
3084 ;; 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
|
3085 ;; 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
|
3086 (goto-char (prog1 (mark t) |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
3087 (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
|
3088 ;; If we do get all the way thru, make this-command indicate that. |
49309
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
3089 (if (eq this-command t) |
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
3090 (setq this-command 'yank)) |
2111
d38d32084c15
* simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2075
diff
changeset
|
3091 nil) |
715 | 3092 |
3093 (defun rotate-yank-pointer (arg) | |
3094 "Rotate the yanking point in the kill ring. | |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
3095 With ARG, rotate that many kills forward (or backward, if negative)." |
715 | 3096 (interactive "p") |
3097 (current-kill arg)) | |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
3098 |
25292 | 3099 ;; Some kill commands. |
3100 | |
3101 ;; Internal subroutine of delete-char | |
3102 (defun kill-forward-chars (arg) | |
3103 (if (listp arg) (setq arg (car arg))) | |
3104 (if (eq arg '-) (setq arg -1)) | |
102658
3bd929838554
* subr.el (forward-point): Add obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
102556
diff
changeset
|
3105 (kill-region (point) (+ (point) arg))) |
25292 | 3106 |
3107 ;; Internal subroutine of backward-delete-char | |
3108 (defun kill-backward-chars (arg) | |
3109 (if (listp arg) (setq arg (car arg))) | |
3110 (if (eq arg '-) (setq arg -1)) | |
102658
3bd929838554
* subr.el (forward-point): Add obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
102556
diff
changeset
|
3111 (kill-region (point) (- (point) arg))) |
25292 | 3112 |
3113 (defcustom backward-delete-char-untabify-method 'untabify | |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
3114 "The method for untabifying when deleting backward. |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
3115 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
|
3116 `hungry' -- delete all whitespace, both tabs and spaces; |
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
3117 `all' -- delete all whitespace, including tabs, spaces and newlines; |
25292 | 3118 nil -- just delete one character." |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
3119 :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
|
3120 :version "20.3" |
25292 | 3121 :group 'killing) |
3122 | |
3123 (defun backward-delete-char-untabify (arg &optional killp) | |
3124 "Delete characters backward, changing tabs into spaces. | |
3125 The exact behavior depends on `backward-delete-char-untabify-method'. | |
3126 Delete ARG chars, and kill (save in kill ring) if KILLP is non-nil. | |
3127 Interactively, ARG is the prefix arg (default 1) | |
3128 and KILLP is t if a prefix arg was specified." | |
3129 (interactive "*p\nP") | |
3130 (when (eq backward-delete-char-untabify-method 'untabify) | |
3131 (let ((count arg)) | |
3132 (save-excursion | |
3133 (while (and (> count 0) (not (bobp))) | |
3134 (if (= (preceding-char) ?\t) | |
3135 (let ((col (current-column))) | |
3136 (forward-char -1) | |
3137 (setq col (- col (current-column))) | |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
3138 (insert-char ?\s col) |
25292 | 3139 (delete-char 1))) |
3140 (forward-char -1) | |
3141 (setq count (1- count)))))) | |
3142 (delete-backward-char | |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
3143 (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
|
3144 ((eq backward-delete-char-untabify-method 'all) |
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
3145 " \t\n\r")))) |
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
3146 (if skip |
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
3147 (let ((wh (- (point) (save-excursion (skip-chars-backward skip) |
25292 | 3148 (point))))) |
3149 (+ arg (if (zerop wh) 0 (1- wh)))) | |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
3150 arg)) |
25292 | 3151 killp)) |
3152 | |
3153 (defun zap-to-char (arg char) | |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
3154 "Kill up to and including ARGth occurrence of CHAR. |
25292 | 3155 Case is ignored if `case-fold-search' is non-nil in the current buffer. |
3156 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
|
3157 (interactive "p\ncZap to char: ") |
102031
7a9e5d67e102
(quoted-insert, zap-to-char): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents:
101897
diff
changeset
|
3158 ;; Avoid "obsolete" warnings for translation-table-for-input. |
7a9e5d67e102
(quoted-insert, zap-to-char): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents:
101897
diff
changeset
|
3159 (with-no-warnings |
7a9e5d67e102
(quoted-insert, zap-to-char): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents:
101897
diff
changeset
|
3160 (if (char-table-p translation-table-for-input) |
7a9e5d67e102
(quoted-insert, zap-to-char): Use `with-no-warnings' around forms that refer
Eli Zaretskii <eliz@gnu.org>
parents:
101897
diff
changeset
|
3161 (setq char (or (aref translation-table-for-input char) char)))) |
25292 | 3162 (kill-region (point) (progn |
3163 (search-forward (char-to-string char) nil nil arg) | |
3164 ; (goto-char (if (> arg 0) (1- (point)) (1+ (point)))) | |
3165 (point)))) | |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
3166 |
25292 | 3167 ;; kill-line and its subroutines. |
3168 | |
3169 (defcustom kill-whole-line nil | |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
3170 "If non-nil, `kill-line' with no arg at beg of line kills the whole line." |
25292 | 3171 :type 'boolean |
3172 :group 'killing) | |
3173 | |
3174 (defun kill-line (&optional arg) | |
3175 "Kill the rest of the current line; if no nonblanks there, kill thru newline. | |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
3176 With prefix argument ARG, kill that many lines from point. |
25292 | 3177 Negative arguments kill lines backward. |
32267 | 3178 With zero argument, kills the text before point on the current line. |
25292 | 3179 |
3180 When calling from a program, nil means \"no arg\", | |
3181 a number counts as a prefix arg. | |
3182 | |
3183 To kill a whole line, when point is not at the beginning, type \ | |
75995 | 3184 \\[move-beginning-of-line] \\[kill-line] \\[kill-line]. |
25292 | 3185 |
3186 If `kill-whole-line' is non-nil, then this command kills the whole line | |
3187 including its terminating newline, when used at the beginning of a line | |
3188 with no argument. As a consequence, you can always kill a whole line | |
75995 | 3189 by typing \\[move-beginning-of-line] \\[kill-line]. |
35916 | 3190 |
36110
116beb1b2fc7
(kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
36030
diff
changeset
|
3191 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
|
3192 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
|
3193 |
35916 | 3194 If the buffer is read-only, Emacs will beep and refrain from deleting |
3195 the line, but put the line in the kill ring anyway. This means that | |
50652 | 3196 you can use this command to copy text from a read-only buffer. |
3197 \(If the variable `kill-read-only-ok' is non-nil, then this won't | |
3198 even beep.)" | |
27836
132294fa754e
(zap-to-char, kill-line, kill-region, kill-word)
Dave Love <fx@gnu.org>
parents:
27477
diff
changeset
|
3199 (interactive "P") |
25292 | 3200 (kill-region (point) |
3201 ;; It is better to move point to the other end of the kill | |
3202 ;; before killing. That way, in a read-only buffer, point | |
3203 ;; moves across the text that is copied to the kill ring. | |
3204 ;; The choice has no effect on undo now that undo records | |
3205 ;; the value of point from before the command was run. | |
3206 (progn | |
3207 (if arg | |
3208 (forward-visible-line (prefix-numeric-value arg)) | |
3209 (if (eobp) | |
3210 (signal 'end-of-buffer nil)) | |
47182
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3211 (let ((end |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3212 (save-excursion |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3213 (end-of-visible-line) (point)))) |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3214 (if (or (save-excursion |
54259
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
3215 ;; If trailing whitespace is visible, |
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
3216 ;; don't treat it as nothing. |
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
3217 (unless show-trailing-whitespace |
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
3218 (skip-chars-forward " \t" end)) |
47182
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3219 (= (point) end)) |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3220 (and kill-whole-line (bolp))) |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3221 (forward-visible-line 1) |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3222 (goto-char end)))) |
25292 | 3223 (point)))) |
3224 | |
51101
821f85e23a1f
* simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51026
diff
changeset
|
3225 (defun kill-whole-line (&optional arg) |
821f85e23a1f
* simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51026
diff
changeset
|
3226 "Kill current line. |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
3227 With prefix ARG, kill that many lines starting from the current line. |
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
3228 If ARG is negative, kill backward. Also kill the preceding newline. |
63592
153f4469d91a
(next-error-buffer-p, next-error-find-buffer): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
63487
diff
changeset
|
3229 \(This is meant to make \\[repeat] work well with negative arguments.\) |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
3230 If ARG is zero, kill current line but exclude the trailing newline." |
55294
1b8ead47966a
(kill-whole-line): Use "p" instead of "P" in interactive form.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55262
diff
changeset
|
3231 (interactive "p") |
101828
fde299e29d94
(kill-whole-line): Provide a default argument of 1.
Glenn Morris <rgm@gnu.org>
parents:
101577
diff
changeset
|
3232 (or arg (setq arg 1)) |
51324
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3233 (if (and (> arg 0) (eobp) (save-excursion (forward-visible-line 0) (eobp))) |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3234 (signal 'end-of-buffer nil)) |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3235 (if (and (< arg 0) (bobp) (save-excursion (end-of-visible-line) (bobp))) |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3236 (signal 'beginning-of-buffer nil)) |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3237 (unless (eq last-command 'kill-region) |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3238 (kill-new "") |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3239 (setq last-command 'kill-region)) |
51101
821f85e23a1f
* simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51026
diff
changeset
|
3240 (cond ((zerop arg) |
51324
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3241 ;; We need to kill in two steps, because the previous command |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3242 ;; could have been a kill command, in which case the text |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3243 ;; before point needs to be prepended to the current kill |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3244 ;; ring entry and the text after point appended. Also, we |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3245 ;; need to use save-excursion to avoid copying the same text |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3246 ;; twice to the kill ring in read-only buffers. |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3247 (save-excursion |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3248 (kill-region (point) (progn (forward-visible-line 0) (point)))) |
51101
821f85e23a1f
* simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51026
diff
changeset
|
3249 (kill-region (point) (progn (end-of-visible-line) (point)))) |
821f85e23a1f
* simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51026
diff
changeset
|
3250 ((< arg 0) |
51324
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3251 (save-excursion |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3252 (kill-region (point) (progn (end-of-visible-line) (point)))) |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3253 (kill-region (point) |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3254 (progn (forward-visible-line (1+ arg)) |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3255 (unless (bobp) (backward-char)) |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3256 (point)))) |
51101
821f85e23a1f
* simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51026
diff
changeset
|
3257 (t |
51324
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3258 (save-excursion |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3259 (kill-region (point) (progn (forward-visible-line 0) (point)))) |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3260 (kill-region (point) |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
3261 (progn (forward-visible-line arg) (point)))))) |
47316
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3262 |
25292 | 3263 (defun forward-visible-line (arg) |
3264 "Move forward by ARG lines, ignoring currently invisible newlines only. | |
3265 If ARG is negative, move backward -ARG lines. | |
3266 If ARG is zero, move to the beginning of the current line." | |
3267 (condition-case nil | |
3268 (if (> arg 0) | |
47316
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3269 (progn |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3270 (while (> arg 0) |
25292 | 3271 (or (zerop (forward-line 1)) |
47316
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3272 (signal 'end-of-buffer nil)) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3273 ;; If the newline we just skipped is invisible, |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3274 ;; don't count it. |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3275 (let ((prop |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3276 (get-char-property (1- (point)) 'invisible))) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3277 (if (if (eq buffer-invisibility-spec t) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3278 prop |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3279 (or (memq prop buffer-invisibility-spec) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3280 (assq prop buffer-invisibility-spec))) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3281 (setq arg (1+ arg)))) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3282 (setq arg (1- arg))) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3283 ;; If invisible text follows, and it is a number of complete lines, |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3284 ;; skip it. |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3285 (let ((opoint (point))) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3286 (while (and (not (eobp)) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3287 (let ((prop |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3288 (get-char-property (point) 'invisible))) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3289 (if (eq buffer-invisibility-spec t) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3290 prop |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3291 (or (memq prop buffer-invisibility-spec) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3292 (assq prop buffer-invisibility-spec))))) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3293 (goto-char |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3294 (if (get-text-property (point) 'invisible) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3295 (or (next-single-property-change (point) 'invisible) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3296 (point-max)) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3297 (next-overlay-change (point))))) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3298 (unless (bolp) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3299 (goto-char opoint)))) |
25292 | 3300 (let ((first t)) |
51219
b86109f9a829
(forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
51118
diff
changeset
|
3301 (while (or first (<= arg 0)) |
b86109f9a829
(forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
51118
diff
changeset
|
3302 (if first |
25292 | 3303 (beginning-of-line) |
3304 (or (zerop (forward-line -1)) | |
3305 (signal 'beginning-of-buffer nil))) | |
47316
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3306 ;; If the newline we just moved to is invisible, |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3307 ;; don't count it. |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3308 (unless (bobp) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3309 (let ((prop |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3310 (get-char-property (1- (point)) 'invisible))) |
51219
b86109f9a829
(forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
51118
diff
changeset
|
3311 (unless (if (eq buffer-invisibility-spec t) |
b86109f9a829
(forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
51118
diff
changeset
|
3312 prop |
b86109f9a829
(forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
51118
diff
changeset
|
3313 (or (memq prop buffer-invisibility-spec) |
b86109f9a829
(forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
51118
diff
changeset
|
3314 (assq prop buffer-invisibility-spec))) |
b86109f9a829
(forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
51118
diff
changeset
|
3315 (setq arg (1+ arg))))) |
b86109f9a829
(forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
51118
diff
changeset
|
3316 (setq first nil)) |
47316
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3317 ;; If invisible text follows, and it is a number of complete lines, |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3318 ;; skip it. |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3319 (let ((opoint (point))) |
25292 | 3320 (while (and (not (bobp)) |
3321 (let ((prop | |
3322 (get-char-property (1- (point)) 'invisible))) | |
3323 (if (eq buffer-invisibility-spec t) | |
3324 prop | |
3325 (or (memq prop buffer-invisibility-spec) | |
3326 (assq prop buffer-invisibility-spec))))) | |
3327 (goto-char | |
3328 (if (get-text-property (1- (point)) 'invisible) | |
3329 (or (previous-single-property-change (point) 'invisible) | |
3330 (point-min)) | |
47316
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3331 (previous-overlay-change (point))))) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3332 (unless (bolp) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
3333 (goto-char opoint))))) |
25292 | 3334 ((beginning-of-buffer end-of-buffer) |
3335 nil))) | |
3336 | |
3337 (defun end-of-visible-line () | |
3338 "Move to end of current visible line." | |
3339 (end-of-line) | |
3340 ;; If the following character is currently invisible, | |
3341 ;; skip all characters with that same `invisible' property value, | |
3342 ;; then find the next newline. | |
3343 (while (and (not (eobp)) | |
47182
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3344 (save-excursion |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3345 (skip-chars-forward "^\n") |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3346 (let ((prop |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3347 (get-char-property (point) 'invisible))) |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3348 (if (eq buffer-invisibility-spec t) |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3349 prop |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3350 (or (memq prop buffer-invisibility-spec) |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3351 (assq prop buffer-invisibility-spec)))))) |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3352 (skip-chars-forward "^\n") |
25292 | 3353 (if (get-text-property (point) 'invisible) |
3354 (goto-char (next-single-property-change (point) 'invisible)) | |
3355 (goto-char (next-overlay-change (point)))) | |
3356 (end-of-line))) | |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
3357 |
475 | 3358 (defun insert-buffer (buffer) |
3359 "Insert after point the contents of BUFFER. | |
3360 Puts mark after the inserted text. | |
26723 | 3361 BUFFER may be a buffer or a buffer name. |
3362 | |
3363 This function is meant for the user to run interactively. | |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
3364 Don't call it from programs: use `insert-buffer-substring' instead!" |
14835
eb78ddcff331
(insert-buffer): Fix typo in previous change.
Erik Naggum <erik@naggum.no>
parents:
14834
diff
changeset
|
3365 (interactive |
14834
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
3366 (list |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
3367 (progn |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
3368 (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
|
3369 (read-buffer "Insert buffer: " |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
3370 (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
|
3371 (other-buffer (current-buffer)) |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
3372 (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
|
3373 t)))) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
3374 (push-mark |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
3375 (save-excursion |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
3376 (insert-buffer-substring (get-buffer buffer)) |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
3377 (point))) |
1982
d65c1fefc636
* simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents:
1838
diff
changeset
|
3378 nil) |
475 | 3379 |
3380 (defun append-to-buffer (buffer start end) | |
3381 "Append to specified buffer the text of the region. | |
3382 It is inserted into that buffer before its point. | |
3383 | |
3384 When calling from a program, give three arguments: | |
3385 BUFFER (or buffer name), START and END. | |
3386 START and END specify the portion of the current buffer to be copied." | |
715 | 3387 (interactive |
10048
db01a04d2afb
(append-to-buffer): Don't use current buffer as default.
Richard M. Stallman <rms@gnu.org>
parents:
10034
diff
changeset
|
3388 (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
|
3389 (region-beginning) (region-end))) |
475 | 3390 (let ((oldbuf (current-buffer))) |
3391 (save-excursion | |
28187
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3392 (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
|
3393 (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
|
3394 point) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3395 (set-buffer append-to) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3396 (setq point (point)) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3397 (barf-if-buffer-read-only) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3398 (insert-buffer-substring oldbuf start end) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3399 (dolist (window windows) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3400 (when (= (window-point window) point) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3401 (set-window-point window (point)))))))) |
475 | 3402 |
3403 (defun prepend-to-buffer (buffer start end) | |
3404 "Prepend to specified buffer the text of the region. | |
3405 It is inserted into that buffer after its point. | |
3406 | |
3407 When calling from a program, give three arguments: | |
3408 BUFFER (or buffer name), START and END. | |
3409 START and END specify the portion of the current buffer to be copied." | |
3410 (interactive "BPrepend to buffer: \nr") | |
3411 (let ((oldbuf (current-buffer))) | |
3412 (save-excursion | |
3413 (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
|
3414 (barf-if-buffer-read-only) |
475 | 3415 (save-excursion |
3416 (insert-buffer-substring oldbuf start end))))) | |
3417 | |
3418 (defun copy-to-buffer (buffer start end) | |
3419 "Copy to specified buffer the text of the region. | |
3420 It is inserted into that buffer, replacing existing text there. | |
3421 | |
3422 When calling from a program, give three arguments: | |
3423 BUFFER (or buffer name), START and END. | |
3424 START and END specify the portion of the current buffer to be copied." | |
3425 (interactive "BCopy to buffer: \nr") | |
3426 (let ((oldbuf (current-buffer))) | |
66595
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
3427 (with-current-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
|
3428 (barf-if-buffer-read-only) |
475 | 3429 (erase-buffer) |
3430 (save-excursion | |
3431 (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
|
3432 |
4040
d06d7295d3eb
Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents:
3967
diff
changeset
|
3433 (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
|
3434 (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
|
3435 |
60463
be3ac492036f
(activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
60414
diff
changeset
|
3436 (defvar activate-mark-hook nil |
be3ac492036f
(activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
60414
diff
changeset
|
3437 "Hook run when the mark becomes active. |
be3ac492036f
(activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
60414
diff
changeset
|
3438 It is also run at the end of a command, if the mark is active and |
76915
b5f8f04cdee4
(activate-mark-hook): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
76803
diff
changeset
|
3439 it is possible that the region may have changed.") |
60463
be3ac492036f
(activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
60414
diff
changeset
|
3440 |
be3ac492036f
(activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
60414
diff
changeset
|
3441 (defvar deactivate-mark-hook nil |
be3ac492036f
(activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
60414
diff
changeset
|
3442 "Hook run when the mark becomes inactive.") |
be3ac492036f
(activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
60414
diff
changeset
|
3443 |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
3444 (defun mark (&optional force) |
68042 | 3445 "Return this buffer's mark value as integer, or nil if never set. |
3446 | |
3447 In Transient Mark mode, this function signals an error if | |
3448 the mark is not active. However, if `mark-even-if-inactive' is non-nil, | |
3449 or the argument FORCE is non-nil, it disregards whether the mark | |
3450 is active, and returns an integer or nil in the usual way. | |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
3451 |
475 | 3452 If you are using this in an editing command, you are most likely making |
3453 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
|
3454 (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
|
3455 (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
|
3456 (signal 'mark-inactive nil))) |
475 | 3457 |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
3458 ;; 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
|
3459 ;; run deactivate-mark-hook. This shorthand should simplify. |
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
3460 (defsubst deactivate-mark () |
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
3461 "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
|
3462 \(That makes a difference only in Transient Mark mode.) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
3463 Also runs the hook `deactivate-mark-hook'." |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3464 (when transient-mark-mode |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3465 (if (or (eq transient-mark-mode 'lambda) |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3466 (and (eq (car-safe transient-mark-mode) 'only) |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3467 (null (cdr transient-mark-mode)))) |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3468 (setq transient-mark-mode nil) |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3469 (if (eq (car-safe transient-mark-mode) 'only) |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3470 (setq transient-mark-mode (cdr transient-mark-mode))) |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3471 (setq mark-active nil) |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3472 (run-hooks 'deactivate-mark-hook)))) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
3473 |
93236
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3474 (defun activate-mark () |
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3475 "Activate the mark." |
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3476 (when (mark t) |
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3477 (setq mark-active t) |
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3478 (unless transient-mark-mode |
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3479 (setq transient-mark-mode 'lambda)))) |
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3480 |
87386
9ec633b7a53d
(select-active-regions): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87377
diff
changeset
|
3481 (defcustom select-active-regions nil |
9ec633b7a53d
(select-active-regions): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87377
diff
changeset
|
3482 "If non-nil, an active region automatically becomes the window selection." |
9ec633b7a53d
(select-active-regions): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87377
diff
changeset
|
3483 :type 'boolean |
9ec633b7a53d
(select-active-regions): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87377
diff
changeset
|
3484 :group 'killing |
9ec633b7a53d
(select-active-regions): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87377
diff
changeset
|
3485 :version "23.1") |
9ec633b7a53d
(select-active-regions): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87377
diff
changeset
|
3486 |
475 | 3487 (defun set-mark (pos) |
3488 "Set this buffer's mark to POS. Don't use this function! | |
3489 That is to say, don't use this function unless you want | |
3490 the user to see that the mark has moved, and you want the previous | |
3491 mark position to be lost. | |
3492 | |
3493 Normally, when a new mark is set, the old one should go on the stack. | |
61121 | 3494 This is why most applications should use `push-mark', not `set-mark'. |
475 | 3495 |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
3496 Novice Emacs Lisp programmers often try to use the mark for the wrong |
475 | 3497 purposes. The mark saves a location for the user's convenience. |
3498 Most editing commands should not alter the mark. | |
3499 To remember a location for internal use in the Lisp program, | |
3500 store it in a Lisp variable. Example: | |
3501 | |
3502 (let ((beg (point))) (forward-line 1) (delete-region beg (point)))." | |
3503 | |
4287
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
3504 (if pos |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
3505 (progn |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
3506 (setq mark-active t) |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
3507 (run-hooks 'activate-mark-hook) |
87386
9ec633b7a53d
(select-active-regions): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87377
diff
changeset
|
3508 (and select-active-regions |
9ec633b7a53d
(select-active-regions): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87377
diff
changeset
|
3509 (x-set-selection |
9ec633b7a53d
(select-active-regions): New option.
Richard M. Stallman <rms@gnu.org>
parents:
87377
diff
changeset
|
3510 nil (buffer-substring (region-beginning) (region-end)))) |
4287
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
3511 (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
|
3512 ;; 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
|
3513 ;; 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
|
3514 ;; 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
|
3515 (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
|
3516 (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
|
3517 (set-marker (mark-marker) nil))) |
475 | 3518 |
87377
1b576fc3020d
(region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87096
diff
changeset
|
3519 (defcustom use-empty-active-region nil |
99992
a3ef480379ae
(use-empty-active-region, use-region-p, region-active-p): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
99799
diff
changeset
|
3520 "Whether \"region-aware\" commands should act on empty regions. |
a3ef480379ae
(use-empty-active-region, use-region-p, region-active-p): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
99799
diff
changeset
|
3521 If nil, region-aware commands treat empty regions as inactive. |
a3ef480379ae
(use-empty-active-region, use-region-p, region-active-p): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
99799
diff
changeset
|
3522 If non-nil, region-aware commands treat the region as active as |
a3ef480379ae
(use-empty-active-region, use-region-p, region-active-p): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
99799
diff
changeset
|
3523 long as the mark is active, even if the region is empty. |
a3ef480379ae
(use-empty-active-region, use-region-p, region-active-p): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
99799
diff
changeset
|
3524 |
99993
26f94bce1bab
Tweak the previous doc fixes.
Chong Yidong <cyd@stupidchicken.com>
parents:
99992
diff
changeset
|
3525 Region-aware commands are those that act on the region if it is |
26f94bce1bab
Tweak the previous doc fixes.
Chong Yidong <cyd@stupidchicken.com>
parents:
99992
diff
changeset
|
3526 active and Transient Mark mode is enabled, and on the text near |
26f94bce1bab
Tweak the previous doc fixes.
Chong Yidong <cyd@stupidchicken.com>
parents:
99992
diff
changeset
|
3527 point otherwise." |
87377
1b576fc3020d
(region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87096
diff
changeset
|
3528 :type 'boolean |
1b576fc3020d
(region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87096
diff
changeset
|
3529 :version "23.1" |
1b576fc3020d
(region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87096
diff
changeset
|
3530 :group 'editing-basics) |
1b576fc3020d
(region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87096
diff
changeset
|
3531 |
87394
06a2cf746b9d
(use-region-p): Renamed from `region-active-p'.
Richard M. Stallman <rms@gnu.org>
parents:
87390
diff
changeset
|
3532 (defun use-region-p () |
99992
a3ef480379ae
(use-empty-active-region, use-region-p, region-active-p): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
99799
diff
changeset
|
3533 "Return t if the region is active and it is appropriate to act on it. |
a3ef480379ae
(use-empty-active-region, use-region-p, region-active-p): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
99799
diff
changeset
|
3534 This is used by commands that act specially on the region under |
a3ef480379ae
(use-empty-active-region, use-region-p, region-active-p): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
99799
diff
changeset
|
3535 Transient Mark mode. It returns t if and only if Transient Mark |
a3ef480379ae
(use-empty-active-region, use-region-p, region-active-p): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
99799
diff
changeset
|
3536 mode is enabled, the mark is active, and the region is non-empty. |
a3ef480379ae
(use-empty-active-region, use-region-p, region-active-p): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
99799
diff
changeset
|
3537 If `use-empty-active-region' is non-nil, it returns t even if the |
a3ef480379ae
(use-empty-active-region, use-region-p, region-active-p): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
99799
diff
changeset
|
3538 region is empty. |
a3ef480379ae
(use-empty-active-region, use-region-p, region-active-p): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
99799
diff
changeset
|
3539 |
a3ef480379ae
(use-empty-active-region, use-region-p, region-active-p): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
99799
diff
changeset
|
3540 For some commands, it may be appropriate to disregard the value |
a3ef480379ae
(use-empty-active-region, use-region-p, region-active-p): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
99799
diff
changeset
|
3541 of `use-empty-active-region'; in that case, use `region-active-p'." |
93561
e39e5bb86d6b
(beginning-of-buffer, end-of-buffer, goto-line, undo)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93548
diff
changeset
|
3542 (and (region-active-p) |
87377
1b576fc3020d
(region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87096
diff
changeset
|
3543 (or use-empty-active-region (> (region-end) (region-beginning))))) |
1b576fc3020d
(region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87096
diff
changeset
|
3544 |
87396
1073cad4beee
(region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87394
diff
changeset
|
3545 (defun region-active-p () |
87410
5ef4fbedb516
(region-active-p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
87396
diff
changeset
|
3546 "Return t if Transient Mark mode is enabled and the mark is active. |
99992
a3ef480379ae
(use-empty-active-region, use-region-p, region-active-p): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
99799
diff
changeset
|
3547 |
99993
26f94bce1bab
Tweak the previous doc fixes.
Chong Yidong <cyd@stupidchicken.com>
parents:
99992
diff
changeset
|
3548 Most commands that act on the region if it is active and |
26f94bce1bab
Tweak the previous doc fixes.
Chong Yidong <cyd@stupidchicken.com>
parents:
99992
diff
changeset
|
3549 Transient Mark mode is enabled, and on the text near point |
26f94bce1bab
Tweak the previous doc fixes.
Chong Yidong <cyd@stupidchicken.com>
parents:
99992
diff
changeset
|
3550 otherwise, should use `use-region-p' instead. That function |
26f94bce1bab
Tweak the previous doc fixes.
Chong Yidong <cyd@stupidchicken.com>
parents:
99992
diff
changeset
|
3551 checks the value of `use-empty-active-region' as well." |
87396
1073cad4beee
(region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87394
diff
changeset
|
3552 (and transient-mark-mode mark-active)) |
1073cad4beee
(region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents:
87394
diff
changeset
|
3553 |
475 | 3554 (defvar mark-ring nil |
8695
0f702e9ab06d
(mark-ring): Add permanent-local prop. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8660
diff
changeset
|
3555 "The list of former marks of the current buffer, most recent first.") |
475 | 3556 (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
|
3557 (put 'mark-ring 'permanent-local t) |
475 | 3558 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3559 (defcustom mark-ring-max 16 |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
3560 "Maximum size of mark ring. Start discarding off end if gets this big." |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3561 :type 'integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3562 :group 'editing-basics) |
475 | 3563 |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3564 (defvar global-mark-ring nil |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3565 "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
|
3566 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3567 (defcustom global-mark-ring-max 16 |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
3568 "Maximum size of global mark ring. \ |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3569 Start discarding off end if gets this big." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3570 :type 'integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3571 :group 'editing-basics) |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3572 |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3573 (defun pop-to-mark-command () |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
3574 "Jump to mark, and pop a new position for mark off the ring. |
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
3575 \(Does not affect global mark ring\)." |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3576 (interactive) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3577 (if (null (mark t)) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3578 (error "No mark set in this buffer") |
77358
9f725c1d891f
(pop-to-mark-command): Display message "mark popped" if point does not move.
Richard M. Stallman <rms@gnu.org>
parents:
77074
diff
changeset
|
3579 (if (= (point) (mark t)) |
9f725c1d891f
(pop-to-mark-command): Display message "mark popped" if point does not move.
Richard M. Stallman <rms@gnu.org>
parents:
77074
diff
changeset
|
3580 (message "Mark popped")) |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3581 (goto-char (mark t)) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3582 (pop-mark))) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3583 |
45540
1756da24c6ba
(push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents:
45386
diff
changeset
|
3584 (defun push-mark-command (arg &optional nomsg) |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3585 "Set mark at where point is. |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
3586 If no prefix ARG and mark is already set there, just activate it. |
45540
1756da24c6ba
(push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents:
45386
diff
changeset
|
3587 Display `Mark set' unless the optional second arg NOMSG is non-nil." |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3588 (interactive "P") |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3589 (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
|
3590 (if (or arg (null mark) (/= mark (point))) |
45540
1756da24c6ba
(push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents:
45386
diff
changeset
|
3591 (push-mark nil nomsg t) |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3592 (setq mark-active t) |
60463
be3ac492036f
(activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
60414
diff
changeset
|
3593 (run-hooks 'activate-mark-hook) |
45540
1756da24c6ba
(push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents:
45386
diff
changeset
|
3594 (unless nomsg |
1756da24c6ba
(push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents:
45386
diff
changeset
|
3595 (message "Mark activated"))))) |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3596 |
66671
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3597 (defcustom set-mark-command-repeat-pop nil |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
3598 "Non-nil means repeating \\[set-mark-command] after popping mark pops it again. |
77459
203581a4dee8
(set-mark-command-repeat-pop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77358
diff
changeset
|
3599 That means that C-u \\[set-mark-command] \\[set-mark-command] |
203581a4dee8
(set-mark-command-repeat-pop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77358
diff
changeset
|
3600 will pop the mark twice, and |
203581a4dee8
(set-mark-command-repeat-pop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77358
diff
changeset
|
3601 C-u \\[set-mark-command] \\[set-mark-command] \\[set-mark-command] |
203581a4dee8
(set-mark-command-repeat-pop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77358
diff
changeset
|
3602 will pop the mark three times. |
203581a4dee8
(set-mark-command-repeat-pop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77358
diff
changeset
|
3603 |
77714
bc6b6a0db3e3
(set-mark-command-repeat-pop): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
77461
diff
changeset
|
3604 A value of nil means \\[set-mark-command]'s behavior does not change |
77459
203581a4dee8
(set-mark-command-repeat-pop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77358
diff
changeset
|
3605 after C-u \\[set-mark-command]." |
66671
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3606 :type 'boolean |
77461
fad036526993
(set-mark-command-repeat-pop): Put in `editing-basics' group.
Richard M. Stallman <rms@gnu.org>
parents:
77459
diff
changeset
|
3607 :group 'editing-basics) |
66671
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3608 |
100623
5a144164af93
(completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100430
diff
changeset
|
3609 (defcustom set-mark-default-inactive nil |
5a144164af93
(completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100430
diff
changeset
|
3610 "If non-nil, setting the mark does not activate it. |
5a144164af93
(completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100430
diff
changeset
|
3611 This causes \\[set-mark-command] and \\[exchange-point-and-mark] to |
5a144164af93
(completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100430
diff
changeset
|
3612 behave the same whether or not `transient-mark-mode' is enabled.") |
5a144164af93
(completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100430
diff
changeset
|
3613 |
475 | 3614 (defun set-mark-command (arg) |
77358
9f725c1d891f
(pop-to-mark-command): Display message "mark popped" if point does not move.
Richard M. Stallman <rms@gnu.org>
parents:
77074
diff
changeset
|
3615 "Set the mark where point is, or jump to the mark. |
9f725c1d891f
(pop-to-mark-command): Display message "mark popped" if point does not move.
Richard M. Stallman <rms@gnu.org>
parents:
77074
diff
changeset
|
3616 Setting the mark also alters the region, which is the text |
9f725c1d891f
(pop-to-mark-command): Display message "mark popped" if point does not move.
Richard M. Stallman <rms@gnu.org>
parents:
77074
diff
changeset
|
3617 between point and mark; this is the closest equivalent in |
9f725c1d891f
(pop-to-mark-command): Display message "mark popped" if point does not move.
Richard M. Stallman <rms@gnu.org>
parents:
77074
diff
changeset
|
3618 Emacs to what some editors call the \"selection\". |
9f725c1d891f
(pop-to-mark-command): Display message "mark popped" if point does not move.
Richard M. Stallman <rms@gnu.org>
parents:
77074
diff
changeset
|
3619 |
9f725c1d891f
(pop-to-mark-command): Display message "mark popped" if point does not move.
Richard M. Stallman <rms@gnu.org>
parents:
77074
diff
changeset
|
3620 With no prefix argument, set the mark at point, and push the |
9f725c1d891f
(pop-to-mark-command): Display message "mark popped" if point does not move.
Richard M. Stallman <rms@gnu.org>
parents:
77074
diff
changeset
|
3621 old mark position on local mark ring. Also push the old mark on |
9f725c1d891f
(pop-to-mark-command): Display message "mark popped" if point does not move.
Richard M. Stallman <rms@gnu.org>
parents:
77074
diff
changeset
|
3622 global mark ring, if the previous mark was set in another buffer. |
9f725c1d891f
(pop-to-mark-command): Display message "mark popped" if point does not move.
Richard M. Stallman <rms@gnu.org>
parents:
77074
diff
changeset
|
3623 |
92715
aa52fda2a68b
(set-mark-command): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
92417
diff
changeset
|
3624 When Transient Mark Mode is off, immediately repeating this |
aa52fda2a68b
(set-mark-command): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
92417
diff
changeset
|
3625 command activates `transient-mark-mode' temporarily. |
50251
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3626 |
77074
ae905157685c
(set-mark-command): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
76915
diff
changeset
|
3627 With prefix argument \(e.g., \\[universal-argument] \\[set-mark-command]\), \ |
77358
9f725c1d891f
(pop-to-mark-command): Display message "mark popped" if point does not move.
Richard M. Stallman <rms@gnu.org>
parents:
77074
diff
changeset
|
3628 jump to the mark, and set the mark from |
77074
ae905157685c
(set-mark-command): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
76915
diff
changeset
|
3629 position popped off the local mark ring \(this does not affect the global |
ae905157685c
(set-mark-command): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
76915
diff
changeset
|
3630 mark ring\). Use \\[pop-global-mark] to jump to a mark popped off the global |
50251
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3631 mark ring \(see `pop-global-mark'\). |
50292
24db6dc3fc9e
Rework last change so C-x C-SPC C-SPC does not
Kim F. Storm <storm@cua.dk>
parents:
50251
diff
changeset
|
3632 |
68280
c1db05754431
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68042
diff
changeset
|
3633 If `set-mark-command-repeat-pop' is non-nil, repeating |
77074
ae905157685c
(set-mark-command): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
76915
diff
changeset
|
3634 the \\[set-mark-command] command with no prefix argument pops the next position |
68280
c1db05754431
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68042
diff
changeset
|
3635 off the local (or global) mark ring and jumps there. |
50251
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3636 |
77358
9f725c1d891f
(pop-to-mark-command): Display message "mark popped" if point does not move.
Richard M. Stallman <rms@gnu.org>
parents:
77074
diff
changeset
|
3637 With \\[universal-argument] \\[universal-argument] as prefix |
9f725c1d891f
(pop-to-mark-command): Display message "mark popped" if point does not move.
Richard M. Stallman <rms@gnu.org>
parents:
77074
diff
changeset
|
3638 argument, unconditionally set mark where point is, even if |
9f725c1d891f
(pop-to-mark-command): Display message "mark popped" if point does not move.
Richard M. Stallman <rms@gnu.org>
parents:
77074
diff
changeset
|
3639 `set-mark-command-repeat-pop' is non-nil. |
69602
5dfbb2116f2d
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
69410
diff
changeset
|
3640 |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
3641 Novice Emacs Lisp programmers often try to use the mark for the wrong |
475 | 3642 purposes. See the documentation of `set-mark' for more information." |
3643 (interactive "P") | |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3644 (cond ((eq transient-mark-mode 'lambda) |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3645 (setq transient-mark-mode nil)) |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3646 ((eq (car-safe transient-mark-mode) 'only) |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3647 (deactivate-mark))) |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3648 (cond |
50292
24db6dc3fc9e
Rework last change so C-x C-SPC C-SPC does not
Kim F. Storm <storm@cua.dk>
parents:
50251
diff
changeset
|
3649 ((and (consp arg) (> (prefix-numeric-value arg) 4)) |
24db6dc3fc9e
Rework last change so C-x C-SPC C-SPC does not
Kim F. Storm <storm@cua.dk>
parents:
50251
diff
changeset
|
3650 (push-mark-command nil)) |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3651 ((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
|
3652 (if arg |
92b336df72b8
(pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents:
44586
diff
changeset
|
3653 (pop-to-mark-command) |
92b336df72b8
(pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents:
44586
diff
changeset
|
3654 (push-mark-command t))) |
66671
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3655 ((and set-mark-command-repeat-pop |
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3656 (eq last-command 'pop-to-mark-command)) |
50251
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3657 (setq this-command 'pop-to-mark-command) |
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3658 (pop-to-mark-command)) |
66671
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3659 ((and set-mark-command-repeat-pop |
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3660 (eq last-command 'pop-global-mark) |
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3661 (not arg)) |
50251
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3662 (setq this-command 'pop-global-mark) |
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3663 (pop-global-mark)) |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3664 (arg |
44664
92b336df72b8
(pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents:
44586
diff
changeset
|
3665 (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
|
3666 (pop-to-mark-command)) |
93236
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3667 ((eq last-command 'set-mark-command) |
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3668 (if (region-active-p) |
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3669 (progn |
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3670 (deactivate-mark) |
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3671 (message "Mark deactivated")) |
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3672 (activate-mark) |
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3673 (message "Mark activated"))) |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3674 (t |
100623
5a144164af93
(completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100430
diff
changeset
|
3675 (push-mark-command nil) |
5a144164af93
(completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100430
diff
changeset
|
3676 (if set-mark-default-inactive (deactivate-mark))))) |
475 | 3677 |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
3678 (defun push-mark (&optional location nomsg activate) |
475 | 3679 "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
|
3680 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
|
3681 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
|
3682 Display `Mark set' unless the optional second arg NOMSG is non-nil. |
475 | 3683 |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
3684 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
|
3685 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
|
3686 |
77750 | 3687 In Transient Mark mode, activate mark if optional third arg ACTIVATE non-nil." |
52046
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
3688 (unless (null (mark t)) |
475 | 3689 (setq mark-ring (cons (copy-marker (mark-marker)) mark-ring)) |
52046
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
3690 (when (> (length mark-ring) mark-ring-max) |
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
3691 (move-marker (car (nthcdr mark-ring-max mark-ring)) nil) |
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
3692 (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
|
3693 (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
|
3694 ;; 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
|
3695 (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
|
3696 (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
|
3697 ;; 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
|
3698 ;; 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
|
3699 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
|
3700 (setq global-mark-ring (cons (copy-marker (mark-marker)) global-mark-ring)) |
52046
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
3701 (when (> (length global-mark-ring) global-mark-ring-max) |
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
3702 (move-marker (car (nthcdr global-mark-ring-max global-mark-ring)) nil) |
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
3703 (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
|
3704 (or nomsg executing-kbd-macro (> (minibuffer-depth) 0) |
475 | 3705 (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
|
3706 (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
|
3707 (set-mark (mark t))) |
475 | 3708 nil) |
3709 | |
3710 (defun pop-mark () | |
3711 "Pop off mark ring into the buffer's actual mark. | |
3712 Does not set point. Does nothing if mark ring is empty." | |
52046
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
3713 (when mark-ring |
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
3714 (setq mark-ring (nconc mark-ring (list (copy-marker (mark-marker))))) |
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
3715 (set-marker (mark-marker) (+ 0 (car mark-ring)) (current-buffer)) |
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
3716 (move-marker (car mark-ring) nil) |
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
3717 (if (null (mark t)) (ding)) |
59486
3b3f211ffa93
(pop-mark): Move deactivate-mark out of conditional
Juri Linkov <juri@jurta.org>
parents:
59397
diff
changeset
|
3718 (setq mark-ring (cdr mark-ring))) |
3b3f211ffa93
(pop-mark): Move deactivate-mark out of conditional
Juri Linkov <juri@jurta.org>
parents:
59397
diff
changeset
|
3719 (deactivate-mark)) |
475 | 3720 |
16436
d2acc84badf4
Use defalias not define-function.
Richard M. Stallman <rms@gnu.org>
parents:
16417
diff
changeset
|
3721 (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
|
3722 (defun exchange-point-and-mark (&optional arg) |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
3723 "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
|
3724 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
|
3725 and it reactivates the mark. |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3726 |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
3727 If Transient Mark mode is on, a prefix ARG deactivates the mark |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3728 if it is active, and otherwise avoids reactivating it. If |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
3729 Transient Mark mode is off, a prefix ARG enables Transient Mark |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3730 mode temporarily." |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3731 (interactive "P") |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3732 (let ((omark (mark t)) |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3733 (temp-highlight (eq (car-safe transient-mark-mode) 'only))) |
93236
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3734 (if (null omark) |
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3735 (error "No mark set in this buffer")) |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3736 (deactivate-mark) |
93236
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3737 (set-mark (point)) |
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3738 (goto-char omark) |
100623
5a144164af93
(completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100430
diff
changeset
|
3739 (if set-mark-default-inactive (deactivate-mark)) |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3740 (cond (temp-highlight |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3741 (setq transient-mark-mode (cons 'only transient-mark-mode))) |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3742 ((or (and arg (region-active-p)) ; (xor arg (not (region-active-p))) |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3743 (not (or arg (region-active-p)))) |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3744 (deactivate-mark)) |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3745 (t (activate-mark))) |
93236
e550714b0fde
(activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93169
diff
changeset
|
3746 nil)) |
2796
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
3747 |
102745
364aae6e6402
* simple.el (shift-select-mode): Make it a defcustom.
Andreas Schwab <schwab@linux-m68k.org>
parents:
102735
diff
changeset
|
3748 (defcustom shift-select-mode t |
102735
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3749 "When non-nil, shifted motion keys activate the mark momentarily. |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3750 |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3751 While the mark is activated in this way, any shift-translated point |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3752 motion key extends the region, and if Transient Mark mode was off, it |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3753 is temporarily turned on. Furthermore, the mark will be deactivated |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3754 by any subsequent point motion key that was not shift-translated, or |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3755 by any action that normally deactivates the mark in Transient Mark mode. |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3756 |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3757 See `this-command-keys-shift-translated' for the meaning of |
102745
364aae6e6402
* simple.el (shift-select-mode): Make it a defcustom.
Andreas Schwab <schwab@linux-m68k.org>
parents:
102735
diff
changeset
|
3758 shift-translation." |
364aae6e6402
* simple.el (shift-select-mode): Make it a defcustom.
Andreas Schwab <schwab@linux-m68k.org>
parents:
102735
diff
changeset
|
3759 :type 'boolean |
364aae6e6402
* simple.el (shift-select-mode): Make it a defcustom.
Andreas Schwab <schwab@linux-m68k.org>
parents:
102735
diff
changeset
|
3760 :group 'editing-basics) |
102735
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3761 |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3762 (defun handle-shift-selection () |
102856
5fcdac62cfcd
* simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
102813
diff
changeset
|
3763 "Activate/deactivate mark depending on invocation thru shift translation. |
5fcdac62cfcd
* simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
102813
diff
changeset
|
3764 This function is called by `call-interactively' when a command |
5fcdac62cfcd
* simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
102813
diff
changeset
|
3765 with a `^' character in its `interactive' spec is invoked, before |
5fcdac62cfcd
* simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
102813
diff
changeset
|
3766 running the command itself. |
5fcdac62cfcd
* simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
102813
diff
changeset
|
3767 |
5fcdac62cfcd
* simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
102813
diff
changeset
|
3768 If `shift-select-mode' is enabled and the command was invoked |
5fcdac62cfcd
* simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
102813
diff
changeset
|
3769 through shift translation, set the mark and activate the region |
5fcdac62cfcd
* simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
102813
diff
changeset
|
3770 temporarily, unless it was already set in this way. See |
5fcdac62cfcd
* simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
102813
diff
changeset
|
3771 `this-command-keys-shift-translated' for the meaning of shift |
5fcdac62cfcd
* simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
102813
diff
changeset
|
3772 translation. |
5fcdac62cfcd
* simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
102813
diff
changeset
|
3773 |
5fcdac62cfcd
* simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
102813
diff
changeset
|
3774 Otherwise, if the region has been activated temporarily, |
5fcdac62cfcd
* simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
102813
diff
changeset
|
3775 deactivate it, and restore the variable `transient-mark-mode' to |
5fcdac62cfcd
* simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
102813
diff
changeset
|
3776 its earlier value." |
102735
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3777 (cond ((and shift-select-mode this-command-keys-shift-translated) |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3778 (unless (and mark-active |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3779 (eq (car-safe transient-mark-mode) 'only)) |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3780 (setq transient-mark-mode |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3781 (cons 'only |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3782 (unless (eq transient-mark-mode 'lambda) |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3783 transient-mark-mode))) |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3784 (push-mark nil nil t))) |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3785 ((eq (car-safe transient-mark-mode) 'only) |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3786 (setq transient-mark-mode (cdr transient-mark-mode)) |
07f2395ce3db
* callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102685
diff
changeset
|
3787 (deactivate-mark)))) |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3788 |
47408
2239db3433ca
(transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47364
diff
changeset
|
3789 (define-minor-mode transient-mark-mode |
2796
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
3790 "Toggle Transient Mark mode. |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
3791 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
|
3792 |
5372
ac927443eae9
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5343
diff
changeset
|
3793 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
|
3794 Changing the buffer \"deactivates\" the mark. |
ac927443eae9
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5343
diff
changeset
|
3795 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
|
3796 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
|
3797 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
|
3798 |
37092
c365952bf534
(transient-mark-mode): Mention ESC ESC ESC in the doc string as well.
Eli Zaretskii <eliz@gnu.org>
parents:
37074
diff
changeset
|
3799 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
|
3800 \\[keyboard-escape-quit]. |
37074
43067b78ec71
(transient-mark-mode): Mention C-g in the doc string.
Eli Zaretskii <eliz@gnu.org>
parents:
36668
diff
changeset
|
3801 |
35631
bc0a3dbd22f6
(transient-mark-mode): Document the fact that many
Eli Zaretskii <eliz@gnu.org>
parents:
35589
diff
changeset
|
3802 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
|
3803 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
|
3804 default part of the buffer's text. Examples of such commands include |
58917
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
3805 \\[comment-dwim], \\[flush-lines], \\[keep-lines], \ |
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
3806 \\[query-replace], \\[query-replace-regexp], \\[ispell], and \\[undo]. |
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
3807 Invoke \\[apropos-documentation] and type \"transient\" or |
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
3808 \"mark.*active\" at the prompt, to see the documentation of |
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
3809 commands which are sensitive to the Transient Mark mode." |
92417
3fb4cc86f03e
(transient-mark-mode): Don't turn on by default.
Glenn Morris <rgm@gnu.org>
parents:
92240
diff
changeset
|
3810 :global t |
93169
48813a8a9a5b
(transient-mark-mode): Turn on by default.
Chong Yidong <cyd@stupidchicken.com>
parents:
93115
diff
changeset
|
3811 :init-value (not noninteractive) |
91911
07b62dd00afa
* simple.el (transient-mark-mode): Add an :init-value.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
91788
diff
changeset
|
3812 :group 'editing-basics) |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3813 |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3814 ;; The variable transient-mark-mode is ugly: it can take on special |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3815 ;; values. Document these here. |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3816 (defvar transient-mark-mode t |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3817 "*Non-nil if Transient Mark mode is enabled. |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3818 See the command `transient-mark-mode' for a description of this minor mode. |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3819 |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3820 Non-nil also enables highlighting of the region whenever the mark is active. |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3821 The variable `highlight-nonselected-windows' controls whether to highlight |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3822 all windows or just the selected window. |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3823 |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
3824 If the value is `lambda', that enables Transient Mark mode temporarily. |
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
3825 After any subsequent action that would normally deactivate the mark |
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
3826 \(such as buffer modification), Transient Mark mode is turned off. |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3827 |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3828 If the value is (only . OLDVAL), that enables Transient Mark mode |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3829 temporarily. After any subsequent point motion command that is not |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3830 shift-translated, or any other action that would normally deactivate |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3831 the mark (such as buffer modification), the value of |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3832 `transient-mark-mode' is set to OLDVAL.") |
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3833 |
61986
91b85d61710d
(widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
61950
diff
changeset
|
3834 (defvar widen-automatically t |
91b85d61710d
(widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
61950
diff
changeset
|
3835 "Non-nil means it is ok for commands to call `widen' when they want to. |
91b85d61710d
(widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
61950
diff
changeset
|
3836 Some commands will do this in order to go to positions outside |
91b85d61710d
(widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
61950
diff
changeset
|
3837 the current accessible part of the buffer. |
91b85d61710d
(widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
61950
diff
changeset
|
3838 |
91b85d61710d
(widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
61950
diff
changeset
|
3839 If `widen-automatically' is nil, these commands will do something else |
91b85d61710d
(widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
61950
diff
changeset
|
3840 as a fallback, and won't change the buffer bounds.") |
91b85d61710d
(widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
61950
diff
changeset
|
3841 |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3842 (defun pop-global-mark () |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3843 "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
|
3844 (interactive) |
7881
4ab8723cd491
(pop-global-mark): Discard entries for nonexistent buffers.
Richard M. Stallman <rms@gnu.org>
parents:
7877
diff
changeset
|
3845 ;; 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
|
3846 (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
|
3847 (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
|
3848 (or global-mark-ring |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3849 (error "No global mark set")) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3850 (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
|
3851 (buffer (marker-buffer marker)) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3852 (position (marker-position marker))) |
10351
e34cbd5276bd
(pop-global-mark): Make pop-global-mark treat
Richard M. Stallman <rms@gnu.org>
parents:
10284
diff
changeset
|
3853 (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
|
3854 (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
|
3855 (set-buffer buffer) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3856 (or (and (>= position (point-min)) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3857 (<= position (point-max))) |
61986
91b85d61710d
(widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
61950
diff
changeset
|
3858 (if widen-automatically |
64911
08a222d72566
(pop-global-mark): Reverse test of widen-automatically.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
3859 (widen) |
08a222d72566
(pop-global-mark): Reverse test of widen-automatically.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
3860 (error "Global mark position is outside accessible part of buffer"))) |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3861 (goto-char position) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3862 (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
|
3863 |
34101
559c35839090
(next-line-add-newlines): Change default to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
34071
diff
changeset
|
3864 (defcustom next-line-add-newlines nil |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
3865 "If non-nil, `next-line' inserts newline to avoid `end of buffer' error." |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3866 :type 'boolean |
35333
ac14700e2c6b
(next-line-add-newlines): Add :version.
Dave Love <fx@gnu.org>
parents:
35327
diff
changeset
|
3867 :version "21.1" |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3868 :group 'editing-basics) |
2568
15014ba142a7
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2446
diff
changeset
|
3869 |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3870 (defun next-line (&optional arg try-vscroll) |
475 | 3871 "Move cursor vertically down ARG lines. |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3872 Interactively, vscroll tall lines if `auto-window-vscroll' is enabled. |
475 | 3873 If there is no character in the target line exactly under the current column, |
3874 the cursor is positioned after the character in that line which spans this | |
3875 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
|
3876 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
|
3877 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
|
3878 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
|
3879 cursor to the end of the buffer. |
475 | 3880 |
96614
a2cd2be2d2c0
(previous-line, next-line): Update docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
96612
diff
changeset
|
3881 If the variable `line-move-visual' is non-nil, this command moves |
a2cd2be2d2c0
(previous-line, next-line): Update docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
96612
diff
changeset
|
3882 by display lines. Otherwise, it moves by buffer lines, without |
a2cd2be2d2c0
(previous-line, next-line): Update docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
96612
diff
changeset
|
3883 taking variable-width characters or continued lines into account. |
a2cd2be2d2c0
(previous-line, next-line): Update docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
96612
diff
changeset
|
3884 |
475 | 3885 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
|
3886 a semipermanent goal column for this command. |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
3887 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
|
3888 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
|
3889 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
|
3890 when there is no goal column. |
475 | 3891 |
3892 If you are thinking of using this in a Lisp program, consider | |
3893 using `forward-line' instead. It is usually easier to use | |
3894 and more reliable (no dependence on goal column, etc.)." | |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3895 (interactive "^p\np") |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
3896 (or arg (setq arg 1)) |
5675
3191bf405867
(next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents:
5635
diff
changeset
|
3897 (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
|
3898 (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
|
3899 ;; 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
|
3900 (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
|
3901 (end-of-line) |
67213
818361523ce8
* longlines.el (longlines-mode): Add mail-setup-hook.
Chong Yidong <cyd@stupidchicken.com>
parents:
67181
diff
changeset
|
3902 (insert (if use-hard-newlines hard-newline "\n"))) |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3903 (line-move arg nil nil try-vscroll)) |
10226
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
3904 (if (interactive-p) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
3905 (condition-case nil |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3906 (line-move arg nil nil try-vscroll) |
10226
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
3907 ((beginning-of-buffer end-of-buffer) (ding))) |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3908 (line-move arg nil nil try-vscroll))) |
475 | 3909 nil) |
3910 | |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3911 (defun previous-line (&optional arg try-vscroll) |
475 | 3912 "Move cursor vertically up ARG lines. |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3913 Interactively, vscroll tall lines if `auto-window-vscroll' is enabled. |
475 | 3914 If there is no character in the target line exactly over the current column, |
3915 the cursor is positioned after the character in that line which spans this | |
3916 column, or at the end of the line if it is not long enough. | |
3917 | |
96614
a2cd2be2d2c0
(previous-line, next-line): Update docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
96612
diff
changeset
|
3918 If the variable `line-move-visual' is non-nil, this command moves |
a2cd2be2d2c0
(previous-line, next-line): Update docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
96612
diff
changeset
|
3919 by display lines. Otherwise, it moves by buffer lines, without |
a2cd2be2d2c0
(previous-line, next-line): Update docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
96612
diff
changeset
|
3920 taking variable-width characters or continued lines into account. |
a2cd2be2d2c0
(previous-line, next-line): Update docstring.
Chong Yidong <cyd@stupidchicken.com>
parents:
96612
diff
changeset
|
3921 |
475 | 3922 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
|
3923 a semipermanent goal column for this command. |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
3924 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
|
3925 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
|
3926 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
|
3927 when there is no goal column. |
475 | 3928 |
3929 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
|
3930 `forward-line' with a negative argument instead. It is usually easier |
475 | 3931 to use and more reliable (no dependence on goal column, etc.)." |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
3932 (interactive "^p\np") |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
3933 (or arg (setq arg 1)) |
10226
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
3934 (if (interactive-p) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
3935 (condition-case nil |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3936 (line-move (- arg) nil nil try-vscroll) |
10226
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
3937 ((beginning-of-buffer end-of-buffer) (ding))) |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3938 (line-move (- arg) nil nil try-vscroll)) |
475 | 3939 nil) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
3940 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3941 (defcustom track-eol nil |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
3942 "Non-nil means vertical motion starting at end of line keeps to ends of lines. |
475 | 3943 This means moving to the end of each line moved onto. |
96612
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
3944 The beginning of a blank line does not count as the end of a line. |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
3945 This has no effect when `line-move-visual' is non-nil." |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3946 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3947 :group 'editing-basics) |
475 | 3948 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3949 (defcustom goal-column nil |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
3950 "Semipermanent goal column for vertical motion, as set by \\[set-goal-column], or nil." |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3951 :type '(choice integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3952 (const :tag "None" nil)) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3953 :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
|
3954 (make-variable-buffer-local 'goal-column) |
475 | 3955 |
3956 (defvar temporary-goal-column 0 | |
3957 "Current goal column for vertical motion. | |
96612
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
3958 It is the column where point was at the start of the current run |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
3959 of vertical motion commands. It is a floating point number when |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
3960 moving by visual lines via `line-move-visual'; this is the |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
3961 x-position, in pixels, divided by the default column width. When |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
3962 the `track-eol' feature is doing its job, the value is |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
3963 `most-positive-fixnum'.") |
475 | 3964 |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3965 (defcustom line-move-ignore-invisible t |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
3966 "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
|
3967 Outline mode sets this." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3968 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3969 :group 'editing-basics) |
10949
99c9f475a355
(line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10943
diff
changeset
|
3970 |
96777
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
3971 (defcustom line-move-visual t |
96612
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
3972 "When non-nil, `line-move' moves point by visual lines. |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
3973 This movement is based on where the cursor is displayed on the |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
3974 screen, instead of relying on buffer contents alone. It takes |
96777
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
3975 into account variable-width characters and line continuation." |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
3976 :type 'boolean |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
3977 :group 'editing-basics) |
96612
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
3978 |
72666
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
3979 ;; Returns non-nil if partial move was done. |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
3980 (defun line-move-partial (arg noerror to-end) |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
3981 (if (< arg 0) |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
3982 ;; Move backward (up). |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
3983 ;; If already vscrolled, reduce vscroll |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
3984 (let ((vs (window-vscroll nil t))) |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
3985 (when (> vs (frame-char-height)) |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
3986 (set-window-vscroll nil (- vs (frame-char-height)) t))) |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
3987 |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
3988 ;; Move forward (down). |
72957
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
3989 (let* ((lh (window-line-height -1)) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
3990 (vpos (nth 1 lh)) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
3991 (ypos (nth 2 lh)) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
3992 (rbot (nth 3 lh)) |
84609
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
3993 py vs) |
72957
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
3994 (when (or (null lh) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
3995 (>= rbot (frame-char-height)) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
3996 (<= ypos (- (frame-char-height)))) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
3997 (unless lh |
73014
c44b9d4a6bf6
(line-move-partial): Call pos-visible-in-window-p with
Kim F. Storm <storm@cua.dk>
parents:
73000
diff
changeset
|
3998 (let ((wend (pos-visible-in-window-p t nil t))) |
c44b9d4a6bf6
(line-move-partial): Call pos-visible-in-window-p with
Kim F. Storm <storm@cua.dk>
parents:
73000
diff
changeset
|
3999 (setq rbot (nth 3 wend) |
c44b9d4a6bf6
(line-move-partial): Call pos-visible-in-window-p with
Kim F. Storm <storm@cua.dk>
parents:
73000
diff
changeset
|
4000 vpos (nth 5 wend)))) |
72957
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4001 (cond |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4002 ;; If last line of window is fully visible, move forward. |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4003 ((or (null rbot) (= rbot 0)) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4004 nil) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4005 ;; If cursor is not in the bottom scroll margin, move forward. |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4006 ((and (> vpos 0) |
72992
291287d0fa38
(line-move-partial): Optimize. Try window-line-height
Kim F. Storm <storm@cua.dk>
parents:
72957
diff
changeset
|
4007 (< (setq py |
291287d0fa38
(line-move-partial): Optimize. Try window-line-height
Kim F. Storm <storm@cua.dk>
parents:
72957
diff
changeset
|
4008 (or (nth 1 (window-line-height)) |
291287d0fa38
(line-move-partial): Optimize. Try window-line-height
Kim F. Storm <storm@cua.dk>
parents:
72957
diff
changeset
|
4009 (let ((ppos (posn-at-point))) |
291287d0fa38
(line-move-partial): Optimize. Try window-line-height
Kim F. Storm <storm@cua.dk>
parents:
72957
diff
changeset
|
4010 (cdr (or (posn-actual-col-row ppos) |
291287d0fa38
(line-move-partial): Optimize. Try window-line-height
Kim F. Storm <storm@cua.dk>
parents:
72957
diff
changeset
|
4011 (posn-col-row ppos)))))) |
72957
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4012 (min (- (window-text-height) scroll-margin 1) (1- vpos)))) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4013 nil) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4014 ;; When already vscrolled, we vscroll some more if we can, |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4015 ;; or clear vscroll and move forward at end of tall image. |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4016 ((> (setq vs (window-vscroll nil t)) 0) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4017 (when (> rbot 0) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4018 (set-window-vscroll nil (+ vs (min rbot (frame-char-height))) t))) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4019 ;; If cursor just entered the bottom scroll margin, move forward, |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4020 ;; but also vscroll one line so redisplay wont recenter. |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4021 ((and (> vpos 0) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4022 (= py (min (- (window-text-height) scroll-margin 1) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4023 (1- vpos)))) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4024 (set-window-vscroll nil (frame-char-height) t) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4025 (line-move-1 arg noerror to-end) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4026 t) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4027 ;; If there are lines above the last line, scroll-up one line. |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4028 ((> vpos 0) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4029 (scroll-up 1) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4030 t) |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4031 ;; Finally, start vscroll. |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4032 (t |
041eaea6e3f2
(line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents:
72923
diff
changeset
|
4033 (set-window-vscroll nil (frame-char-height) t))))))) |
72666
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
4034 |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
4035 |
63136 | 4036 ;; This is like line-move-1 except that it also performs |
4037 ;; vertical scrolling of tall images if appropriate. | |
4038 ;; That is not really a clean thing to do, since it mixes | |
4039 ;; scrolling with cursor motion. But so far we don't have | |
4040 ;; a cleaner solution to the problem of making C-n do something | |
4041 ;; useful given a tall image. | |
60176
9440f8bb9f71
(line-move): Add fourth optional arg try-vscroll which
Kim F. Storm <storm@cua.dk>
parents:
60007
diff
changeset
|
4042 (defun line-move (arg &optional noerror to-end try-vscroll) |
72666
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
4043 (unless (and auto-window-vscroll try-vscroll |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
4044 ;; Only vscroll for single line moves |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
4045 (= (abs arg) 1) |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
4046 ;; But don't vscroll in a keyboard macro. |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
4047 (not defining-kbd-macro) |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
4048 (not executing-kbd-macro) |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
4049 (line-move-partial arg noerror to-end)) |
aa474eace5e0
(line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents:
72645
diff
changeset
|
4050 (set-window-vscroll nil 0 t) |
96612
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
4051 (if line-move-visual |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
4052 (line-move-visual arg noerror) |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
4053 (line-move-1 arg noerror to-end)))) |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
4054 |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
4055 ;; Display-based alternative to line-move-1. |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
4056 ;; Arg says how many lines to move. The value is t if we can move the |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
4057 ;; specified number of lines. |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
4058 (defun line-move-visual (arg &optional noerror) |
103072
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4059 (let ((posn (posn-at-point)) |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4060 (opoint (point)) |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4061 x) |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4062 ;; Reset temporary-goal-column, unless the previous command was a |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4063 ;; line-motion command or we were called from some other command. |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4064 (unless (and (floatp temporary-goal-column) |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4065 (memq last-command `(next-line previous-line ,this-command))) |
101849
0750b250db3d
(line-move-visual): Handle overflow-newline-into-fringe.
Chong Yidong <cyd@stupidchicken.com>
parents:
101828
diff
changeset
|
4066 (cond ((eq (nth 1 posn) 'right-fringe) ; overflow-newline-into-fringe |
0750b250db3d
(line-move-visual): Handle overflow-newline-into-fringe.
Chong Yidong <cyd@stupidchicken.com>
parents:
101828
diff
changeset
|
4067 (setq temporary-goal-column (- (window-width) 1))) |
103072
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4068 ((setq x (car (posn-x-y posn))) |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4069 (setq temporary-goal-column (/ (float x) (frame-char-width)))))) |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4070 ;; Move using `vertical-motion'. |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4071 (or (and (= (vertical-motion |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4072 (cons (or goal-column (truncate temporary-goal-column)) arg)) |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4073 arg) |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4074 (or (>= arg 0) |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4075 (/= (point) opoint) |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4076 ;; If the goal column lies on a display string, |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4077 ;; `vertical-motion' advances the cursor to the end |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4078 ;; of the string. For arg < 0, this can cause the |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4079 ;; cursor to get stuck. (Bug#3020). |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4080 (= (vertical-motion arg) arg))) |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4081 (unless noerror |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4082 (signal (if (< arg 0) 'beginning-of-buffer 'end-of-buffer) |
ce405af23a6e
* simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents:
102867
diff
changeset
|
4083 nil))))) |
59680
1d33b3da1157
(line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents:
59626
diff
changeset
|
4084 |
11326
0d5ebc078c51
(line-move): Turn off intangibility for intermediate stops.
Richard M. Stallman <rms@gnu.org>
parents:
11324
diff
changeset
|
4085 ;; 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
|
4086 ;; Arg says how many lines to move. |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4087 ;; The value is t if we can move the specified number of lines. |
59680
1d33b3da1157
(line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents:
59626
diff
changeset
|
4088 (defun line-move-1 (arg &optional noerror to-end) |
11479
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
4089 ;; 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
|
4090 ;; for intermediate positions. |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
4091 (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
|
4092 (opoint (point)) |
73000
fea9765e7991
* simple.el (line-move-1): Escape field boundaries occurring
Chong Yidong <cyd@stupidchicken.com>
parents:
72992
diff
changeset
|
4093 (orig-arg arg)) |
96777
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4094 (if (floatp temporary-goal-column) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4095 (setq temporary-goal-column (truncate temporary-goal-column))) |
11479
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
4096 (unwind-protect |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
4097 (progn |
44505
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4098 (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
|
4099 (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
|
4100 (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
|
4101 ;; 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
|
4102 ;; unless we just did explicit end-of-line. |
71420
093ea85cc89f
(line-move-1): Check for move-end-of-line instead of
Kim F. Storm <storm@cua.dk>
parents:
70959
diff
changeset
|
4103 (or (not (bolp)) (eq last-command 'move-end-of-line))) |
84609
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
4104 most-positive-fixnum |
11479
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
4105 (current-column)))) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4106 |
84609
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
4107 (if (not (or (integerp selective-display) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
4108 line-move-ignore-invisible)) |
11479
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
4109 ;; 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
|
4110 ;; 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
|
4111 (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
|
4112 (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
|
4113 ;; 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
|
4114 ;; 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
|
4115 ;; 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
|
4116 (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
|
4117 (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
|
4118 (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
|
4119 (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
|
4120 (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
|
4121 (setq arg 0))) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4122 (unless noerror |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4123 (signal (if (< arg 0) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4124 'beginning-of-buffer |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4125 'end-of-buffer) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4126 nil))) |
11479
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
4127 ;; Move by arg lines, but ignore invisible ones. |
76513
1a4b3e645c66
(line-move-1): Respect `inhibit-line-move-field-capture' property.
Chong Yidong <cyd@stupidchicken.com>
parents:
76386
diff
changeset
|
4128 (let (done) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4129 (while (and (> arg 0) (not done)) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4130 ;; If the following character is currently invisible, |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4131 ;; skip all characters with that same `invisible' property value. |
78658
6a12da4aa52f
(invisible-p): Rename from text-invisible-p. Update callers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78611
diff
changeset
|
4132 (while (and (not (eobp)) (invisible-p (point))) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4133 (goto-char (next-char-property-change (point)))) |
73000
fea9765e7991
* simple.el (line-move-1): Escape field boundaries occurring
Chong Yidong <cyd@stupidchicken.com>
parents:
72992
diff
changeset
|
4134 ;; Move a line. |
fea9765e7991
* simple.el (line-move-1): Escape field boundaries occurring
Chong Yidong <cyd@stupidchicken.com>
parents:
72992
diff
changeset
|
4135 ;; We don't use `end-of-line', since we want to escape |
fea9765e7991
* simple.el (line-move-1): Escape field boundaries occurring
Chong Yidong <cyd@stupidchicken.com>
parents:
72992
diff
changeset
|
4136 ;; from field boundaries ocurring exactly at point. |
76513
1a4b3e645c66
(line-move-1): Respect `inhibit-line-move-field-capture' property.
Chong Yidong <cyd@stupidchicken.com>
parents:
76386
diff
changeset
|
4137 (goto-char (constrain-to-field |
1a4b3e645c66
(line-move-1): Respect `inhibit-line-move-field-capture' property.
Chong Yidong <cyd@stupidchicken.com>
parents:
76386
diff
changeset
|
4138 (let ((inhibit-field-text-motion t)) |
1a4b3e645c66
(line-move-1): Respect `inhibit-line-move-field-capture' property.
Chong Yidong <cyd@stupidchicken.com>
parents:
76386
diff
changeset
|
4139 (line-end-position)) |
1a4b3e645c66
(line-move-1): Respect `inhibit-line-move-field-capture' property.
Chong Yidong <cyd@stupidchicken.com>
parents:
76386
diff
changeset
|
4140 (point) t t |
1a4b3e645c66
(line-move-1): Respect `inhibit-line-move-field-capture' property.
Chong Yidong <cyd@stupidchicken.com>
parents:
76386
diff
changeset
|
4141 'inhibit-line-move-field-capture)) |
61864
af1b504ffc35
(line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents:
61671
diff
changeset
|
4142 ;; If there's no invisibility here, move over the newline. |
64289
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4143 (cond |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4144 ((eobp) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4145 (if (not noerror) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4146 (signal 'end-of-buffer nil) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4147 (setq done t))) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4148 ((and (> arg 1) ;; Use vertical-motion for last move |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4149 (not (integerp selective-display)) |
78658
6a12da4aa52f
(invisible-p): Rename from text-invisible-p. Update callers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78611
diff
changeset
|
4150 (not (invisible-p (point)))) |
64289
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4151 ;; We avoid vertical-motion when possible |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4152 ;; because that has to fontify. |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4153 (forward-line 1)) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4154 ;; Otherwise move a more sophisticated way. |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4155 ((zerop (vertical-motion 1)) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4156 (if (not noerror) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4157 (signal 'end-of-buffer nil) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4158 (setq done t)))) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4159 (unless done |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4160 (setq arg (1- arg)))) |
62093
ea21bf283231
(line-move-1): Fix 2005-04-26 change. Must still use
Kim F. Storm <storm@cua.dk>
parents:
62059
diff
changeset
|
4161 ;; The logic of this is the same as the loop above, |
61864
af1b504ffc35
(line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents:
61671
diff
changeset
|
4162 ;; it just goes in the other direction. |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4163 (while (and (< arg 0) (not done)) |
73408
5fdade8e4fef
* simple.el (line-move-1): During fields during motion to the
Chong Yidong <cyd@stupidchicken.com>
parents:
73330
diff
changeset
|
4164 ;; For completely consistency with the forward-motion |
5fdade8e4fef
* simple.el (line-move-1): During fields during motion to the
Chong Yidong <cyd@stupidchicken.com>
parents:
73330
diff
changeset
|
4165 ;; case, we should call beginning-of-line here. |
5fdade8e4fef
* simple.el (line-move-1): During fields during motion to the
Chong Yidong <cyd@stupidchicken.com>
parents:
73330
diff
changeset
|
4166 ;; However, if point is inside a field and on a |
5fdade8e4fef
* simple.el (line-move-1): During fields during motion to the
Chong Yidong <cyd@stupidchicken.com>
parents:
73330
diff
changeset
|
4167 ;; continued line, the call to (vertical-motion -1) |
5fdade8e4fef
* simple.el (line-move-1): During fields during motion to the
Chong Yidong <cyd@stupidchicken.com>
parents:
73330
diff
changeset
|
4168 ;; below won't move us back far enough; then we return |
5fdade8e4fef
* simple.el (line-move-1): During fields during motion to the
Chong Yidong <cyd@stupidchicken.com>
parents:
73330
diff
changeset
|
4169 ;; to the same column in line-move-finish, and point |
5fdade8e4fef
* simple.el (line-move-1): During fields during motion to the
Chong Yidong <cyd@stupidchicken.com>
parents:
73330
diff
changeset
|
4170 ;; gets stuck -- cyd |
5fdade8e4fef
* simple.el (line-move-1): During fields during motion to the
Chong Yidong <cyd@stupidchicken.com>
parents:
73330
diff
changeset
|
4171 (forward-line 0) |
64289
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4172 (cond |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4173 ((bobp) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4174 (if (not noerror) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4175 (signal 'beginning-of-buffer nil) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4176 (setq done t))) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4177 ((and (< arg -1) ;; Use vertical-motion for last move |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4178 (not (integerp selective-display)) |
78658
6a12da4aa52f
(invisible-p): Rename from text-invisible-p. Update callers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78611
diff
changeset
|
4179 (not (invisible-p (1- (point))))) |
64289
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4180 (forward-line -1)) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4181 ((zerop (vertical-motion -1)) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4182 (if (not noerror) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4183 (signal 'beginning-of-buffer nil) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
4184 (setq done t)))) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4185 (unless done |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4186 (setq arg (1+ arg)) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4187 (while (and ;; Don't move over previous invis lines |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4188 ;; if our target is the middle of this line. |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4189 (or (zerop (or goal-column temporary-goal-column)) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4190 (< arg 0)) |
78658
6a12da4aa52f
(invisible-p): Rename from text-invisible-p. Update callers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78611
diff
changeset
|
4191 (not (bobp)) (invisible-p (1- (point)))) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4192 (goto-char (previous-char-property-change (point)))))))) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4193 ;; This is the value the function returns. |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4194 (= arg 0)) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4195 |
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
|
4196 (cond ((> arg 0) |
95526
437d3830a398
(line-move-1): If we did not move as far as desired, ensure that
Chong Yidong <cyd@stupidchicken.com>
parents:
95367
diff
changeset
|
4197 ;; If we did not move down as far as desired, at least go |
437d3830a398
(line-move-1): If we did not move as far as desired, ensure that
Chong Yidong <cyd@stupidchicken.com>
parents:
95367
diff
changeset
|
4198 ;; to end of line. Be sure to call point-entered and |
437d3830a398
(line-move-1): If we did not move as far as desired, ensure that
Chong Yidong <cyd@stupidchicken.com>
parents:
95367
diff
changeset
|
4199 ;; point-left-hooks. |
437d3830a398
(line-move-1): If we did not move as far as desired, ensure that
Chong Yidong <cyd@stupidchicken.com>
parents:
95367
diff
changeset
|
4200 (let* ((npoint (prog1 (line-end-position) |
437d3830a398
(line-move-1): If we did not move as far as desired, ensure that
Chong Yidong <cyd@stupidchicken.com>
parents:
95367
diff
changeset
|
4201 (goto-char opoint))) |
437d3830a398
(line-move-1): If we did not move as far as desired, ensure that
Chong Yidong <cyd@stupidchicken.com>
parents:
95367
diff
changeset
|
4202 (inhibit-point-motion-hooks nil)) |
437d3830a398
(line-move-1): If we did not move as far as desired, ensure that
Chong Yidong <cyd@stupidchicken.com>
parents:
95367
diff
changeset
|
4203 (goto-char npoint))) |
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
|
4204 ((< arg 0) |
64598
e139156061a7
(line-move-1): Fix comments.
Juri Linkov <juri@jurta.org>
parents:
64548
diff
changeset
|
4205 ;; If we did not move up as far as desired, |
e139156061a7
(line-move-1): Fix comments.
Juri Linkov <juri@jurta.org>
parents:
64548
diff
changeset
|
4206 ;; at least go to beginning of line. |
95526
437d3830a398
(line-move-1): If we did not move as far as desired, ensure that
Chong Yidong <cyd@stupidchicken.com>
parents:
95367
diff
changeset
|
4207 (let* ((npoint (prog1 (line-beginning-position) |
437d3830a398
(line-move-1): If we did not move as far as desired, ensure that
Chong Yidong <cyd@stupidchicken.com>
parents:
95367
diff
changeset
|
4208 (goto-char opoint))) |
437d3830a398
(line-move-1): If we did not move as far as desired, ensure that
Chong Yidong <cyd@stupidchicken.com>
parents:
95367
diff
changeset
|
4209 (inhibit-point-motion-hooks nil)) |
437d3830a398
(line-move-1): If we did not move as far as desired, ensure that
Chong Yidong <cyd@stupidchicken.com>
parents:
95367
diff
changeset
|
4210 (goto-char npoint))) |
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
|
4211 (t |
58354
36916d006f6b
(line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents:
58046
diff
changeset
|
4212 (line-move-finish (or goal-column temporary-goal-column) |
73000
fea9765e7991
* simple.el (line-move-1): Escape field boundaries occurring
Chong Yidong <cyd@stupidchicken.com>
parents:
72992
diff
changeset
|
4213 opoint (> orig-arg 0))))))) |
58354
36916d006f6b
(line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents:
58046
diff
changeset
|
4214 |
36916d006f6b
(line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents:
58046
diff
changeset
|
4215 (defun line-move-finish (column opoint forward) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4216 (let ((repeat t)) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4217 (while repeat |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4218 ;; 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
|
4219 (setq repeat nil) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4220 |
44756
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
4221 (let (new |
73109
4a02fd618570
* simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents:
73101
diff
changeset
|
4222 (old (point)) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4223 (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
|
4224 (line-end |
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
4225 ;; Compute the end of the line |
58354
36916d006f6b
(line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents:
58046
diff
changeset
|
4226 ;; ignoring effectively invisible newlines. |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4227 (save-excursion |
66346
37f27a66c519
(line-move-finish): Ignore fields computing LINE-END.
Richard M. Stallman <rms@gnu.org>
parents:
66281
diff
changeset
|
4228 ;; Like end-of-line but ignores fields. |
37f27a66c519
(line-move-finish): Ignore fields computing LINE-END.
Richard M. Stallman <rms@gnu.org>
parents:
66281
diff
changeset
|
4229 (skip-chars-forward "^\n") |
78658
6a12da4aa52f
(invisible-p): Rename from text-invisible-p. Update callers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78611
diff
changeset
|
4230 (while (and (not (eobp)) (invisible-p (point))) |
58354
36916d006f6b
(line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents:
58046
diff
changeset
|
4231 (goto-char (next-char-property-change (point))) |
66346
37f27a66c519
(line-move-finish): Ignore fields computing LINE-END.
Richard M. Stallman <rms@gnu.org>
parents:
66281
diff
changeset
|
4232 (skip-chars-forward "^\n")) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4233 (point)))) |
44756
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
4234 |
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
4235 ;; 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
|
4236 (line-move-to-column column) |
73109
4a02fd618570
* simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents:
73101
diff
changeset
|
4237 |
4a02fd618570
* simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents:
73101
diff
changeset
|
4238 ;; Corner case: suppose we start out in a field boundary in |
4a02fd618570
* simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents:
73101
diff
changeset
|
4239 ;; the middle of a continued line. When we get to |
4a02fd618570
* simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents:
73101
diff
changeset
|
4240 ;; line-move-finish, point is at the start of a new *screen* |
4a02fd618570
* simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents:
73101
diff
changeset
|
4241 ;; line but the same text line; then line-move-to-column would |
4a02fd618570
* simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents:
73101
diff
changeset
|
4242 ;; move us backwards. Test using C-n with point on the "x" in |
4a02fd618570
* simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents:
73101
diff
changeset
|
4243 ;; (insert "a" (propertize "x" 'field t) (make-string 89 ?y)) |
4a02fd618570
* simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents:
73101
diff
changeset
|
4244 (and forward |
4a02fd618570
* simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents:
73101
diff
changeset
|
4245 (< (point) old) |
4a02fd618570
* simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents:
73101
diff
changeset
|
4246 (goto-char old)) |
4a02fd618570
* simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents:
73101
diff
changeset
|
4247 |
44756
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
4248 (setq new (point)) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4249 |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4250 ;; Process intangibility within a line. |
70842 | 4251 ;; With inhibit-point-motion-hooks bound to nil, a call to |
4252 ;; goto-char moves point past intangible text. | |
4253 | |
4254 ;; However, inhibit-point-motion-hooks controls both the | |
4255 ;; intangibility and the point-entered/point-left hooks. The | |
4256 ;; following hack avoids calling the point-* hooks | |
4257 ;; unnecessarily. Note that we move *forward* past intangible | |
4258 ;; text when the initial and final points are the same. | |
70620
b23be18ae943
* simple.el (line-move-finish): Don't call point motion hooks
Chong Yidong <cyd@stupidchicken.com>
parents:
70590
diff
changeset
|
4259 (goto-char new) |
70623
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4260 (let ((inhibit-point-motion-hooks nil)) |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4261 (goto-char new) |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4262 |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4263 ;; If intangibility moves us to a different (later) place |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4264 ;; in the same line, use that as the destination. |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4265 (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
|
4266 (setq new (point)) |
70623
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4267 ;; If that position is "too late", |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4268 ;; try the previous allowable position. |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4269 ;; See if it is ok. |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4270 (backward-char) |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4271 (if (if forward |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4272 ;; If going forward, don't accept the previous |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4273 ;; allowable position if it is before the target line. |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4274 (< line-beg (point)) |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4275 ;; If going backward, don't accept the previous |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4276 ;; allowable position if it is still after the target line. |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4277 (<= (point) line-end)) |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4278 (setq new (point)) |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4279 ;; As a last resort, use the end of the line. |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
4280 (setq new line-end)))) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4281 |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4282 ;; Now move to the updated destination, processing fields |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4283 ;; as well as intangibility. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4284 (goto-char opoint) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4285 (let ((inhibit-point-motion-hooks nil)) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4286 (goto-char |
73167
1b3313de1c4c
* simple.el (line-move-finish): Ignore field boundaries if the
Chong Yidong <cyd@stupidchicken.com>
parents:
73109
diff
changeset
|
4287 ;; Ignore field boundaries if the initial and final |
1b3313de1c4c
* simple.el (line-move-finish): Ignore field boundaries if the
Chong Yidong <cyd@stupidchicken.com>
parents:
73109
diff
changeset
|
4288 ;; positions have the same `field' property, even if the |
1b3313de1c4c
* simple.el (line-move-finish): Ignore field boundaries if the
Chong Yidong <cyd@stupidchicken.com>
parents:
73109
diff
changeset
|
4289 ;; fields are non-contiguous. This seems to be "nicer" |
1b3313de1c4c
* simple.el (line-move-finish): Ignore field boundaries if the
Chong Yidong <cyd@stupidchicken.com>
parents:
73109
diff
changeset
|
4290 ;; behavior in many situations. |
1b3313de1c4c
* simple.el (line-move-finish): Ignore field boundaries if the
Chong Yidong <cyd@stupidchicken.com>
parents:
73109
diff
changeset
|
4291 (if (eq (get-char-property new 'field) |
1b3313de1c4c
* simple.el (line-move-finish): Ignore field boundaries if the
Chong Yidong <cyd@stupidchicken.com>
parents:
73109
diff
changeset
|
4292 (get-char-property opoint 'field)) |
1b3313de1c4c
* simple.el (line-move-finish): Ignore field boundaries if the
Chong Yidong <cyd@stupidchicken.com>
parents:
73109
diff
changeset
|
4293 new |
1b3313de1c4c
* simple.el (line-move-finish): Ignore field boundaries if the
Chong Yidong <cyd@stupidchicken.com>
parents:
73109
diff
changeset
|
4294 (constrain-to-field new opoint t t |
1b3313de1c4c
* simple.el (line-move-finish): Ignore field boundaries if the
Chong Yidong <cyd@stupidchicken.com>
parents:
73109
diff
changeset
|
4295 'inhibit-line-move-field-capture)))) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4296 |
44756
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
4297 ;; 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
|
4298 ;; retry everything within that new line. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4299 (when (or (< (point) line-beg) (> (point) line-end)) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4300 ;; Repeat the intangibility and field processing. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4301 (setq repeat t)))))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4302 |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4303 (defun line-move-to-column (col) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4304 "Try to find column COL, considering invisibility. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4305 This function works only in certain cases, |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4306 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
|
4307 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
|
4308 (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
|
4309 (beginning-of-line) |
72922
e5dae51e141c
* simple.el (line-move-to-column): Revert 2006-08-03 change.
Chong Yidong <cyd@stupidchicken.com>
parents:
72909
diff
changeset
|
4310 (move-to-column col)) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4311 |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4312 (when (and line-move-ignore-invisible |
78658
6a12da4aa52f
(invisible-p): Rename from text-invisible-p. Update callers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78611
diff
changeset
|
4313 (not (bolp)) (invisible-p (1- (point)))) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4314 (let ((normal-location (point)) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4315 (normal-column (current-column))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4316 ;; If the following character is currently invisible, |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4317 ;; 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
|
4318 (while (and (not (eobp)) |
78658
6a12da4aa52f
(invisible-p): Rename from text-invisible-p. Update callers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78611
diff
changeset
|
4319 (invisible-p (point))) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4320 (goto-char (next-char-property-change (point)))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4321 ;; Have we advanced to a larger column position? |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4322 (if (> (current-column) normal-column) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4323 ;; 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
|
4324 ;; See if we can make any further progress. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4325 (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
|
4326 ;; Otherwise, go to the place we originally found |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4327 ;; and move back over invisible text. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4328 ;; 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
|
4329 ;; but with a more reasonable buffer position. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4330 (goto-char normal-location) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4331 (let ((line-beg (save-excursion (beginning-of-line) (point)))) |
78658
6a12da4aa52f
(invisible-p): Rename from text-invisible-p. Update callers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78611
diff
changeset
|
4332 (while (and (not (bolp)) (invisible-p (1- (point)))) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
4333 (goto-char (previous-char-property-change (point) line-beg)))))))) |
475 | 4334 |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4335 (defun move-end-of-line (arg) |
68042 | 4336 "Move point to end of current line as displayed. |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4337 With argument ARG not nil or 1, move forward ARG - 1 lines first. |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4338 If point reaches the beginning or end of buffer, it stops there. |
100880 | 4339 |
4340 To ignore the effects of the `intangible' text or overlay | |
4341 property, bind `inhibit-point-motion-hooks' to t. | |
4342 If there is an image in the current line, this function | |
4343 disregards newlines that are part of the text on which the image | |
4344 rests." | |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
4345 (interactive "^p") |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4346 (or arg (setq arg 1)) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4347 (let (done) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4348 (while (not done) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4349 (let ((newpos |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4350 (save-excursion |
96612
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
4351 (let ((goal-column 0) |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
4352 (line-move-visual nil)) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4353 (and (line-move arg t) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4354 (not (bobp)) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4355 (progn |
78658
6a12da4aa52f
(invisible-p): Rename from text-invisible-p. Update callers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78611
diff
changeset
|
4356 (while (and (not (bobp)) (invisible-p (1- (point)))) |
84609
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
4357 (goto-char (previous-single-char-property-change |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
4358 (point) 'invisible))) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4359 (backward-char 1))) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4360 (point))))) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4361 (goto-char newpos) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4362 (if (and (> (point) newpos) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4363 (eq (preceding-char) ?\n)) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4364 (backward-char 1) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4365 (if (and (> (point) newpos) (not (eobp)) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4366 (not (eq (following-char) ?\n))) |
96612
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
4367 ;; If we skipped something intangible and now we're not |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
4368 ;; really at eol, keep going. |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4369 (setq arg 1) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4370 (setq done t))))))) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4371 |
60486
47a57ff1da21
(move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents:
60463
diff
changeset
|
4372 (defun move-beginning-of-line (arg) |
68042 | 4373 "Move point to beginning of current line as displayed. |
4374 \(If there's an image in the line, this disregards newlines | |
4375 which are part of the text that the image rests on.) | |
4376 | |
60486
47a57ff1da21
(move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents:
60463
diff
changeset
|
4377 With argument ARG not nil or 1, move forward ARG - 1 lines first. |
47a57ff1da21
(move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents:
60463
diff
changeset
|
4378 If point reaches the beginning or end of buffer, it stops there. |
68042 | 4379 To ignore intangibility, bind `inhibit-point-motion-hooks' to t." |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
4380 (interactive "^p") |
60486
47a57ff1da21
(move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents:
60463
diff
changeset
|
4381 (or arg (setq arg 1)) |
69899
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
4382 |
72411
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4383 (let ((orig (point)) |
84609
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
4384 first-vis first-vis-field-value) |
68403
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
4385 |
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
4386 ;; Move by lines, if ARG is not 1 (the default). |
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
4387 (if (/= arg 1) |
96612
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
4388 (let ((line-move-visual nil)) |
6350f3d3cff2
(line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents:
96124
diff
changeset
|
4389 (line-move (1- arg) t))) |
68403
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
4390 |
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
4391 ;; Move to beginning-of-line, ignoring fields and invisibles. |
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
4392 (skip-chars-backward "^\n") |
78658
6a12da4aa52f
(invisible-p): Rename from text-invisible-p. Update callers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78611
diff
changeset
|
4393 (while (and (not (bobp)) (invisible-p (1- (point)))) |
68537
0cbfc61cfa3f
(move-beginning-of-line): Scan properly for invis change.
Richard M. Stallman <rms@gnu.org>
parents:
68403
diff
changeset
|
4394 (goto-char (previous-char-property-change (point))) |
68403
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
4395 (skip-chars-backward "^\n")) |
72411
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4396 |
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4397 ;; Now find first visible char in the line |
78658
6a12da4aa52f
(invisible-p): Rename from text-invisible-p. Update callers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78611
diff
changeset
|
4398 (while (and (not (eobp)) (invisible-p (point))) |
72411
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4399 (goto-char (next-char-property-change (point)))) |
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4400 (setq first-vis (point)) |
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4401 |
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4402 ;; See if fields would stop us from reaching FIRST-VIS. |
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4403 (setq first-vis-field-value |
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4404 (constrain-to-field first-vis orig (/= arg 1) t nil)) |
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4405 |
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4406 (goto-char (if (/= first-vis-field-value first-vis) |
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4407 ;; If yes, obey them. |
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4408 first-vis-field-value |
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4409 ;; Otherwise, move to START with attention to fields. |
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4410 ;; (It is possible that fields never matter in this case.) |
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4411 (constrain-to-field (point) orig |
b11613448626
(move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents:
72254
diff
changeset
|
4412 (/= arg 1) t nil))))) |
60486
47a57ff1da21
(move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents:
60463
diff
changeset
|
4413 |
47a57ff1da21
(move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents:
60463
diff
changeset
|
4414 |
1771
3f0f18d4eb8c
* simple.el (set-goal-column): Make this command disabled by default.
Jim Blandy <jimb@redhat.com>
parents:
1760
diff
changeset
|
4415 ;;; 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
|
4416 ;;; 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
|
4417 (put 'set-goal-column 'disabled t) |
475 | 4418 |
4419 (defun set-goal-column (arg) | |
4420 "Set the current horizontal position as a goal for \\[next-line] and \\[previous-line]. | |
4421 Those commands will move to this position in the line moved to | |
4422 rather than trying to keep the same horizontal position. | |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
4423 With a non-nil argument ARG, 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
|
4424 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
|
4425 The goal column is stored in the variable `goal-column'." |
475 | 4426 (interactive "P") |
4427 (if arg | |
4428 (progn | |
4429 (setq goal-column nil) | |
4430 (message "No goal column")) | |
4431 (setq goal-column (current-column)) | |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
4432 ;; The older method below can be erroneous if `set-goal-column' is bound |
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
4433 ;; to a sequence containing % |
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
4434 ;;(message (substitute-command-keys |
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
4435 ;;"Goal column %d (use \\[set-goal-column] with an arg to unset it)") |
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
4436 ;;goal-column) |
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
4437 (message "%s" |
66823
e0104334e066
(what-cursor-position): Print (EOB) instead of (100%)
Kim F. Storm <storm@cua.dk>
parents:
66671
diff
changeset
|
4438 (concat |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
4439 (format "Goal column %d " goal-column) |
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
4440 (substitute-command-keys |
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
4441 "(use \\[set-goal-column] with an arg to unset it)"))) |
66823
e0104334e066
(what-cursor-position): Print (EOB) instead of (100%)
Kim F. Storm <storm@cua.dk>
parents:
66671
diff
changeset
|
4442 |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
4443 ) |
475 | 4444 nil) |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
4445 |
96777
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4446 ;;; Editing based on visual lines, as opposed to logical lines. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4447 |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4448 (defun end-of-visual-line (&optional n) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4449 "Move point to end of current visual line. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4450 With argument N not nil or 1, move forward N - 1 visual lines first. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4451 If point reaches the beginning or end of buffer, it stops there. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4452 To ignore intangibility, bind `inhibit-point-motion-hooks' to t." |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4453 (interactive "^p") |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4454 (or n (setq n 1)) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4455 (if (/= n 1) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4456 (let ((line-move-visual t)) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4457 (line-move (1- n) t))) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4458 (vertical-motion (cons (window-width) 0))) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4459 |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4460 (defun beginning-of-visual-line (&optional n) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4461 "Move point to beginning of current visual line. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4462 With argument N not nil or 1, move forward N - 1 visual lines first. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4463 If point reaches the beginning or end of buffer, it stops there. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4464 To ignore intangibility, bind `inhibit-point-motion-hooks' to t." |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4465 (interactive "^p") |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4466 (or n (setq n 1)) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4467 (if (/= n 1) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4468 (let ((line-move-visual t)) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4469 (line-move (1- n) t))) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4470 (vertical-motion 0)) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4471 |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4472 (defun kill-visual-line (&optional arg) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4473 "Kill the rest of the visual line. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4474 If there are only whitespace characters there, kill through the |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4475 newline as well. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4476 |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
4477 With prefix argument ARG, kill that many lines from point. |
96777
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4478 Negative arguments kill lines backward. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4479 With zero argument, kill the text before point on the current line. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4480 |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4481 When calling from a program, nil means \"no arg\", |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4482 a number counts as a prefix arg. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4483 |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4484 If `kill-whole-line' is non-nil, then this command kills the whole line |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4485 including its terminating newline, when used at the beginning of a line |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4486 with no argument. As a consequence, you can always kill a whole line |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4487 by typing \\[beginning-of-line] \\[kill-line]. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4488 |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4489 If you want to append the killed line to the last killed text, |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4490 use \\[append-next-kill] before \\[kill-line]. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4491 |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4492 If the buffer is read-only, Emacs will beep and refrain from deleting |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4493 the line, but put the line in the kill ring anyway. This means that |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4494 you can use this command to copy text from a read-only buffer. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4495 \(If the variable `kill-read-only-ok' is non-nil, then this won't |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4496 even beep.)" |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4497 (interactive "P") |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4498 (let ((opoint (point)) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4499 (line-move-visual t) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4500 end) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4501 ;; It is better to move point to the other end of the kill before |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4502 ;; killing. That way, in a read-only buffer, point moves across |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4503 ;; the text that is copied to the kill ring. The choice has no |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4504 ;; effect on undo now that undo records the value of point from |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4505 ;; before the command was run. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4506 (if arg |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4507 (vertical-motion (prefix-numeric-value arg)) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4508 (if (eobp) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4509 (signal 'end-of-buffer nil)) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4510 (setq end (save-excursion |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4511 (end-of-visual-line) (point))) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4512 (if (or (save-excursion |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4513 ;; If trailing whitespace is visible, |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4514 ;; don't treat it as nothing. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4515 (unless show-trailing-whitespace |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4516 (skip-chars-forward " \t" end)) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4517 (= (point) end)) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4518 (and kill-whole-line (bolp))) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4519 (line-move 1) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4520 (goto-char end))) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4521 (kill-region opoint (point)))) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4522 |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4523 (defun next-logical-line (&optional arg try-vscroll) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4524 "Move cursor vertically down ARG lines. |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
4525 This is identical to `next-line', except that it always moves |
96777
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4526 by logical lines instead of visual lines, ignoring the value of |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4527 the variable `line-move-visual'." |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4528 (interactive "^p\np") |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4529 (let ((line-move-visual nil)) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4530 (with-no-warnings |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4531 (next-line arg try-vscroll)))) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4532 |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4533 (defun previous-logical-line (&optional arg try-vscroll) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4534 "Move cursor vertically up ARG lines. |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4535 This is identical to `previous-line', except that it always moves |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4536 by logical lines instead of visual lines, ignoring the value of |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4537 the variable `line-move-visual'." |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4538 (interactive "^p\np") |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4539 (let ((line-move-visual nil)) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4540 (with-no-warnings |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4541 (previous-line arg try-vscroll)))) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4542 |
96843
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4543 (defgroup visual-line nil |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4544 "Editing based on visual lines." |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4545 :group 'convenience |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4546 :version "23.1") |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4547 |
96777
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4548 (defvar visual-line-mode-map |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4549 (let ((map (make-sparse-keymap))) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4550 (define-key map [remap kill-line] 'kill-visual-line) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4551 (define-key map [remap move-beginning-of-line] 'beginning-of-visual-line) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4552 (define-key map [remap move-end-of-line] 'end-of-visual-line) |
100882
47e78f883705
(visual-line-mode-map): Remove M-[ and M-] bindings.
Chong Yidong <cyd@stupidchicken.com>
parents:
100880
diff
changeset
|
4553 ;; These keybindings interfere with xterm function keys. Are |
47e78f883705
(visual-line-mode-map): Remove M-[ and M-] bindings.
Chong Yidong <cyd@stupidchicken.com>
parents:
100880
diff
changeset
|
4554 ;; there any other suitable bindings? |
47e78f883705
(visual-line-mode-map): Remove M-[ and M-] bindings.
Chong Yidong <cyd@stupidchicken.com>
parents:
100880
diff
changeset
|
4555 ;; (define-key map "\M-[" 'previous-logical-line) |
47e78f883705
(visual-line-mode-map): Remove M-[ and M-] bindings.
Chong Yidong <cyd@stupidchicken.com>
parents:
100880
diff
changeset
|
4556 ;; (define-key map "\M-]" 'next-logical-line) |
96777
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4557 map)) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4558 |
96843
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4559 (defcustom visual-line-fringe-indicators '(nil nil) |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4560 "How fringe indicators are shown for wrapped lines in `visual-line-mode'. |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4561 The value should be a list of the form (LEFT RIGHT), where LEFT |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4562 and RIGHT are symbols representing the bitmaps to display, to |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4563 indicate wrapped lines, in the left and right fringes respectively. |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4564 See also `fringe-indicator-alist'. |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4565 The default is not to display fringe indicators for wrapped lines. |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4566 This variable does not affect fringe indicators displayed for |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4567 other purposes." |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4568 :type '(list (choice (const :tag "Hide left indicator" nil) |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4569 (const :tag "Left curly arrow" left-curly-arrow) |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4570 (symbol :tag "Other bitmap")) |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4571 (choice (const :tag "Hide right indicator" nil) |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4572 (const :tag "Right curly arrow" right-curly-arrow) |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4573 (symbol :tag "Other bitmap"))) |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4574 :set (lambda (symbol value) |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4575 (dolist (buf (buffer-list)) |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4576 (with-current-buffer buf |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4577 (when (and (boundp 'visual-line-mode) |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4578 (symbol-value 'visual-line-mode)) |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4579 (setq fringe-indicator-alist |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4580 (cons (cons 'continuation value) |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4581 (assq-delete-all |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4582 'continuation |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4583 (copy-tree fringe-indicator-alist))))))) |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4584 (set-default symbol value))) |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4585 |
97437
c7a00c2c8219
(visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97150
diff
changeset
|
4586 (defvar visual-line--saved-state nil) |
c7a00c2c8219
(visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97150
diff
changeset
|
4587 |
96777
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4588 (define-minor-mode visual-line-mode |
96845
55273a37c1d5
(visual-line-mode): Add lighter.
Chong Yidong <cyd@stupidchicken.com>
parents:
96843
diff
changeset
|
4589 "Redefine simple editing commands to act on visual lines, not logical lines. |
55273a37c1d5
(visual-line-mode): Add lighter.
Chong Yidong <cyd@stupidchicken.com>
parents:
96843
diff
changeset
|
4590 This also turns on `word-wrap' in the buffer." |
96777
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4591 :keymap visual-line-mode-map |
96843
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4592 :group 'visual-line |
96845
55273a37c1d5
(visual-line-mode): Add lighter.
Chong Yidong <cyd@stupidchicken.com>
parents:
96843
diff
changeset
|
4593 :lighter " wrap" |
96777
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4594 (if visual-line-mode |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4595 (progn |
97437
c7a00c2c8219
(visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97150
diff
changeset
|
4596 (set (make-local-variable 'visual-line--saved-state) nil) |
c7a00c2c8219
(visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97150
diff
changeset
|
4597 ;; Save the local values of some variables, to be restored if |
c7a00c2c8219
(visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97150
diff
changeset
|
4598 ;; visual-line-mode is turned off. |
c7a00c2c8219
(visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97150
diff
changeset
|
4599 (dolist (var '(line-move-visual truncate-lines |
c7a00c2c8219
(visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97150
diff
changeset
|
4600 truncate-partial-width-windows |
c7a00c2c8219
(visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97150
diff
changeset
|
4601 word-wrap fringe-indicator-alist)) |
c7a00c2c8219
(visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97150
diff
changeset
|
4602 (if (local-variable-p var) |
97438
1d048637d408
Delete trailing whitespace.
Chong Yidong <cyd@stupidchicken.com>
parents:
97437
diff
changeset
|
4603 (push (cons var (symbol-value var)) |
97437
c7a00c2c8219
(visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97150
diff
changeset
|
4604 visual-line--saved-state))) |
96777
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4605 (set (make-local-variable 'line-move-visual) t) |
96874
8683c121397c
(visual-line-mode): Disable truncate-partial-width-windows.
Chong Yidong <cyd@stupidchicken.com>
parents:
96845
diff
changeset
|
4606 (set (make-local-variable 'truncate-partial-width-windows) nil) |
8683c121397c
(visual-line-mode): Disable truncate-partial-width-windows.
Chong Yidong <cyd@stupidchicken.com>
parents:
96845
diff
changeset
|
4607 (setq truncate-lines nil |
8683c121397c
(visual-line-mode): Disable truncate-partial-width-windows.
Chong Yidong <cyd@stupidchicken.com>
parents:
96845
diff
changeset
|
4608 word-wrap t |
8683c121397c
(visual-line-mode): Disable truncate-partial-width-windows.
Chong Yidong <cyd@stupidchicken.com>
parents:
96845
diff
changeset
|
4609 fringe-indicator-alist |
96843
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4610 (cons (cons 'continuation visual-line-fringe-indicators) |
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4611 fringe-indicator-alist))) |
96777
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4612 (kill-local-variable 'line-move-visual) |
96843
cc8f5c6c468e
(visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents:
96777
diff
changeset
|
4613 (kill-local-variable 'word-wrap) |
96874
8683c121397c
(visual-line-mode): Disable truncate-partial-width-windows.
Chong Yidong <cyd@stupidchicken.com>
parents:
96845
diff
changeset
|
4614 (kill-local-variable 'truncate-lines) |
8683c121397c
(visual-line-mode): Disable truncate-partial-width-windows.
Chong Yidong <cyd@stupidchicken.com>
parents:
96845
diff
changeset
|
4615 (kill-local-variable 'truncate-partial-width-windows) |
97437
c7a00c2c8219
(visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97150
diff
changeset
|
4616 (kill-local-variable 'fringe-indicator-alist) |
c7a00c2c8219
(visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97150
diff
changeset
|
4617 (dolist (saved visual-line--saved-state) |
c7a00c2c8219
(visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97150
diff
changeset
|
4618 (set (make-local-variable (car saved)) (cdr saved))) |
c7a00c2c8219
(visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
97150
diff
changeset
|
4619 (kill-local-variable 'visual-line--saved-state))) |
96777
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4620 |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4621 (defun turn-on-visual-line-mode () |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4622 (visual-line-mode 1)) |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4623 |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4624 (define-globalized-minor-mode global-visual-line-mode |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4625 visual-line-mode turn-on-visual-line-mode |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4626 :lighter " vl") |
66c97af5f33c
(line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents:
96675
diff
changeset
|
4627 |
8006
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
4628 (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
|
4629 "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
|
4630 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
|
4631 (interactive "P") |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
4632 (scroll-other-window |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
4633 ;; Just invert the argument's meaning. |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
4634 ;; 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
|
4635 (if (eq lines '-) nil |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
4636 (if (null lines) '- |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
4637 (- (prefix-numeric-value lines)))))) |
8057
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4638 |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4639 (defun beginning-of-buffer-other-window (arg) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4640 "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
|
4641 Leave mark at previous position. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4642 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
|
4643 (interactive "P") |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4644 (let ((orig-window (selected-window)) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4645 (window (other-window-for-scrolling))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4646 ;; 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
|
4647 ;; 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
|
4648 (unwind-protect |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4649 (progn |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4650 (select-window window) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4651 ;; Set point and mark in that window's buffer. |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4652 (with-no-warnings |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4653 (beginning-of-buffer arg)) |
8057
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4654 ;; Set point accordingly. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4655 (recenter '(t))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4656 (select-window orig-window)))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4657 |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4658 (defun end-of-buffer-other-window (arg) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4659 "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
|
4660 Leave mark at previous position. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4661 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
|
4662 (interactive "P") |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4663 ;; See beginning-of-buffer-other-window for comments. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4664 (let ((orig-window (selected-window)) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4665 (window (other-window-for-scrolling))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4666 (unwind-protect |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4667 (progn |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4668 (select-window window) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4669 (with-no-warnings |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
4670 (end-of-buffer arg)) |
8057
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4671 (recenter '(t))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
4672 (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
|
4673 |
475 | 4674 (defun transpose-chars (arg) |
4675 "Interchange characters around point, moving forward one character. | |
4676 With prefix arg ARG, effect is to take character before point | |
4677 and drag it forward past ARG other characters (backward if ARG negative). | |
4678 If no argument and at end of line, the previous two chars are exchanged." | |
4679 (interactive "*P") | |
4680 (and (null arg) (eolp) (forward-char -1)) | |
4681 (transpose-subr 'forward-char (prefix-numeric-value arg))) | |
4682 | |
4683 (defun transpose-words (arg) | |
4684 "Interchange words around point, leaving point at end of them. | |
4685 With prefix arg ARG, effect is to take word before or around point | |
4686 and drag it forward past ARG other words (backward if ARG negative). | |
4687 If ARG is zero, the words around or after point and around or after mark | |
4688 are interchanged." | |
44505
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4689 ;; FIXME: `foo a!nd bar' should transpose into `bar and foo'. |
475 | 4690 (interactive "*p") |
4691 (transpose-subr 'forward-word arg)) | |
4692 | |
4693 (defun transpose-sexps (arg) | |
4694 "Like \\[transpose-words] but applies to sexps. | |
4695 Does not work on a sexp that point is in the middle of | |
4696 if it is a list or string." | |
4697 (interactive "*p") | |
44505
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4698 (transpose-subr |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4699 (lambda (arg) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4700 ;; 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
|
4701 ;; (cons (progn (forward-sexp x) (point)) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4702 ;; (progn (forward-sexp (- x)) (point))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4703 ;; 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
|
4704 ;; 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
|
4705 ;; 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
|
4706 (if (if (> arg 0) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4707 (looking-at "\\sw\\|\\s_") |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4708 (and (not (bobp)) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4709 (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
|
4710 ;; 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
|
4711 (progn (funcall (if (> arg 0) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4712 'skip-syntax-backward 'skip-syntax-forward) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4713 "w_") |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4714 (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
|
4715 ;; 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
|
4716 ;; 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
|
4717 ;; we're going. |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4718 (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
|
4719 (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
|
4720 (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
|
4721 (not (zerop (funcall (if (> arg 0) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4722 'skip-syntax-forward |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4723 'skip-syntax-backward) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4724 "."))))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4725 (point))))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4726 arg 'special)) |
475 | 4727 |
4728 (defun transpose-lines (arg) | |
4729 "Exchange current line and previous line, leaving point after both. | |
4730 With argument ARG, takes previous line and moves it past ARG lines. | |
4731 With argument 0, interchanges line point is in with line mark is in." | |
4732 (interactive "*p") | |
4733 (transpose-subr (function | |
4734 (lambda (arg) | |
20465
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
4735 (if (> arg 0) |
475 | 4736 (progn |
20465
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
4737 ;; Move forward over ARG lines, |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
4738 ;; but create newlines if necessary. |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
4739 (setq arg (forward-line arg)) |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
4740 (if (/= (preceding-char) ?\n) |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
4741 (setq arg (1+ arg))) |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
4742 (if (> arg 0) |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
4743 (newline arg))) |
475 | 4744 (forward-line arg)))) |
4745 arg)) | |
4746 | |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4747 (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
|
4748 (let ((aux (if special mover |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4749 (lambda (x) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4750 (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
|
4751 (progn (funcall mover (- x)) (point)))))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4752 pos1 pos2) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4753 (cond |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4754 ((= arg 0) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4755 (save-excursion |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4756 (setq pos1 (funcall aux 1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4757 (goto-char (mark)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4758 (setq pos2 (funcall aux 1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4759 (transpose-subr-1 pos1 pos2)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4760 (exchange-point-and-mark)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4761 ((> arg 0) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4762 (setq pos1 (funcall aux -1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4763 (setq pos2 (funcall aux arg)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4764 (transpose-subr-1 pos1 pos2) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4765 (goto-char (car pos2))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4766 (t |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4767 (setq pos1 (funcall aux -1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4768 (goto-char (car pos1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4769 (setq pos2 (funcall aux arg)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4770 (transpose-subr-1 pos1 pos2))))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4771 |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4772 (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
|
4773 (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
|
4774 (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
|
4775 (when (> (car pos1) (car pos2)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4776 (let ((swap pos1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4777 (setq pos1 pos2 pos2 swap))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4778 (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
|
4779 (atomic-change-group |
49ff3106980b
(undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
43032
diff
changeset
|
4780 (let (word2) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
4781 ;; FIXME: We first delete the two pieces of text, so markers that |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
4782 ;; used to point to after the text end up pointing to before it :-( |
43125
49ff3106980b
(undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
43032
diff
changeset
|
4783 (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
|
4784 (goto-char (car pos2)) |
49ff3106980b
(undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
43032
diff
changeset
|
4785 (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
|
4786 (goto-char (car pos1)) |
49ff3106980b
(undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
43032
diff
changeset
|
4787 (insert word2)))) |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
4788 |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
4789 (defun backward-word (&optional arg) |
39110 | 4790 "Move backward until encountering the beginning of a word. |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
4791 With argument ARG, do this that many times." |
93548
715d9d088f88
(deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents:
93397
diff
changeset
|
4792 (interactive "^p") |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
4793 (forward-word (- (or arg 1)))) |
475 | 4794 |
59178
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
4795 (defun mark-word (&optional arg allow-extend) |
58917
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
4796 "Set mark ARG words away from point. |
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
4797 The place mark goes is the same place \\[forward-word] would |
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
4798 move to with the same argument. |
59178
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
4799 Interactively, if this command is repeated |
59397
fcfd5e8c8e77
(completion-list-mode-map): Map follow-link to mouse-face.
Kim F. Storm <storm@cua.dk>
parents:
59261
diff
changeset
|
4800 or (in Transient Mark mode) if the mark is active, |
58917
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
4801 it marks the next ARG words after the ones already marked." |
59178
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
4802 (interactive "P\np") |
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
4803 (cond ((and allow-extend |
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
4804 (or (and (eq last-command this-command) (mark t)) |
93561
e39e5bb86d6b
(beginning-of-buffer, end-of-buffer, goto-line, undo)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93548
diff
changeset
|
4805 (region-active-p))) |
58917
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
4806 (setq arg (if arg (prefix-numeric-value arg) |
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
4807 (if (< (mark) (point)) -1 1))) |
43301
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
4808 (set-mark |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
4809 (save-excursion |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
4810 (goto-char (mark)) |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
4811 (forward-word arg) |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
4812 (point)))) |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
4813 (t |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
4814 (push-mark |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
4815 (save-excursion |
58917
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
4816 (forward-word (prefix-numeric-value arg)) |
43301
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
4817 (point)) |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
4818 nil t)))) |
475 | 4819 |
4820 (defun kill-word (arg) | |
4821 "Kill characters forward until encountering the end of a word. | |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
4822 With argument ARG, 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
|
4823 (interactive "p") |
25400
c75839c09c84
(kill-word): Undo previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25342
diff
changeset
|
4824 (kill-region (point) (progn (forward-word arg) (point)))) |
475 | 4825 |
4826 (defun backward-kill-word (arg) | |
75113
80f0c81302ab
(backward-kill-word): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
74848
diff
changeset
|
4827 "Kill characters backward until encountering the beginning of a word. |
99654
ade78ac09095
* simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents:
99643
diff
changeset
|
4828 With argument ARG, 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
|
4829 (interactive "p") |
475 | 4830 (kill-word (- arg))) |
2416
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
4831 |
51802
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4832 (defun current-word (&optional strict really-word) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4833 "Return the symbol or word that point is on (or a nearby one) as a string. |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4834 The return value includes no text properties. |
6174
3902f1241d1c
(current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
6160
diff
changeset
|
4835 If optional arg STRICT is non-nil, return nil unless point is within |
56378
cc9dcd357544
(current-word): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56081
diff
changeset
|
4836 or adjacent to a symbol or word. In all cases the value can be nil |
cc9dcd357544
(current-word): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
56081
diff
changeset
|
4837 if there is no word nearby. |
51802
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4838 The function, belying its name, normally finds a symbol. |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4839 If optional arg REALLY-WORD is non-nil, it finds just a word." |
2416
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
4840 (save-excursion |
51802
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4841 (let* ((oldpoint (point)) (start (point)) (end (point)) |
51957
af9092ef950b
(current-word): Don't include punctuation char when
John Paul Wallington <jpw@pobox.com>
parents:
51802
diff
changeset
|
4842 (syntaxes (if really-word "w" "w_")) |
51802
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4843 (not-syntaxes (concat "^" syntaxes))) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4844 (skip-syntax-backward syntaxes) (setq start (point)) |
2416
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
4845 (goto-char oldpoint) |
51802
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4846 (skip-syntax-forward syntaxes) (setq end (point)) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4847 (when (and (eq start oldpoint) (eq end oldpoint) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4848 ;; Point is neither within nor adjacent to a word. |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4849 (not strict)) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4850 ;; Look for preceding word in same line. |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4851 (skip-syntax-backward not-syntaxes |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4852 (save-excursion (beginning-of-line) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4853 (point))) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4854 (if (bolp) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4855 ;; No preceding word in same line. |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4856 ;; Look for following word in same line. |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4857 (progn |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4858 (skip-syntax-forward not-syntaxes |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4859 (save-excursion (end-of-line) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4860 (point))) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4861 (setq start (point)) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4862 (skip-syntax-forward syntaxes) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4863 (setq end (point))) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4864 (setq end (point)) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4865 (skip-syntax-backward syntaxes) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4866 (setq start (point)))) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4867 ;; If we found something nonempty, return it as a string. |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4868 (unless (= start end) |
18379
1dd6f63f0ea3
(paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18334
diff
changeset
|
4869 (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
|
4870 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4871 (defcustom fill-prefix nil |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
4872 "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
|
4873 :type '(choice (const :tag "None" nil) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4874 string) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4875 :group 'fill) |
475 | 4876 (make-variable-buffer-local 'fill-prefix) |
92948
73a01bf5cb80
* faces.el (xw-defined-colors):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92715
diff
changeset
|
4877 (put 'fill-prefix 'safe-local-variable 'string-or-null-p) |
475 | 4878 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4879 (defcustom auto-fill-inhibit-regexp nil |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
4880 "Regexp to match lines which should not be auto-filled." |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4881 :type '(choice (const :tag "None" nil) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4882 regexp) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4883 :group 'fill) |
475 | 4884 |
21122
912cc3491589
(do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents:
21074
diff
changeset
|
4885 ;; 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
|
4886 ;; 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
|
4887 ;; 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
|
4888 ;; (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
|
4889 ;; but this one is the default one.) |
475 | 4890 (defun do-auto-fill () |
55699
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4891 (let (fc justify give-up |
12708
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
4892 (fill-prefix fill-prefix)) |
10471
3eb77f03f53e
(do-auto-fill): justification renamed to current-justification.
Richard M. Stallman <rms@gnu.org>
parents:
10469
diff
changeset
|
4893 (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
|
4894 (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
|
4895 (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
|
4896 (<= (current-column) fc)) |
55699
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4897 (and auto-fill-inhibit-regexp |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4898 (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
|
4899 (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
|
4900 nil ;; Auto-filling not required |
10813
bccf0295c66e
(open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents:
10805
diff
changeset
|
4901 (if (memq justify '(full center right)) |
bccf0295c66e
(open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents:
10805
diff
changeset
|
4902 (save-excursion (unjustify-current-line))) |
12708
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
4903 |
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
4904 ;; 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
|
4905 (when (and adaptive-fill-mode |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4906 (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
|
4907 (let ((prefix |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4908 (fill-context-prefix |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4909 (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
|
4910 (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
|
4911 (and prefix (not (equal prefix "")) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4912 ;; Use auto-indentation rather than a guessed empty prefix. |
47362
e1687eeb0232
(do-auto-fill): `fill-indent-according-to-mode' is a variable, not a
Miles Bader <miles@gnu.org>
parents:
47353
diff
changeset
|
4913 (not (and fill-indent-according-to-mode |
47346
8287dca5eb2d
(what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47316
diff
changeset
|
4914 (string-match "\\`[ \t]*\\'" prefix))) |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4915 (setq fill-prefix prefix)))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49585
diff
changeset
|
4916 |
10469
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
4917 (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
|
4918 ;; 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
|
4919 (let* (after-prefix |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
4920 (fill-point |
55699
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4921 (save-excursion |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4922 (beginning-of-line) |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4923 (setq after-prefix (point)) |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4924 (and fill-prefix |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4925 (looking-at (regexp-quote fill-prefix)) |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4926 (setq after-prefix (match-end 0))) |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4927 (move-to-column (1+ fc)) |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4928 (fill-move-to-break-point after-prefix) |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4929 (point)))) |
19343
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
4930 |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
4931 ;; 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
|
4932 (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
|
4933 (goto-char fill-point) |
44505
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4934 (or (bolp) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4935 ;; 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
|
4936 (save-excursion (skip-chars-forward " ") (eolp)) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4937 ;; 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
|
4938 ;; 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
|
4939 (and after-prefix (<= (point) after-prefix)) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4940 ;; 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
|
4941 ;; 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
|
4942 (and comment-start-skip |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4943 (let ((limit (point))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4944 (beginning-of-line) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4945 (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
|
4946 limit t) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4947 (eq (point) limit)))))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4948 ;; 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
|
4949 (setq give-up t) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4950 ;; 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
|
4951 (let ((prev-column (current-column))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4952 ;; 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
|
4953 ;; 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
|
4954 ;; 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
|
4955 (if (save-excursion |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4956 (skip-chars-backward " \t") |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4957 (= (point) fill-point)) |
82303
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4958 (default-indent-new-line t) |
44505
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4959 (save-excursion |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4960 (goto-char fill-point) |
82303
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4961 (default-indent-new-line t))) |
44505
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4962 ;; Now do justification, if required |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4963 (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
|
4964 (save-excursion |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4965 (end-of-line 0) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4966 (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
|
4967 ;; 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
|
4968 ;; 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
|
4969 ;; trying again will not help. |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4970 (if (>= (current-column) prev-column) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4971 (setq give-up t)))))) |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
4972 ;; Justify last line. |
15263
0d7899c372ed
(do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents:
15115
diff
changeset
|
4973 (justify-current-line justify t t) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
4974 t))) |
475 | 4975 |
82303
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4976 (defvar comment-line-break-function 'comment-indent-new-line |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4977 "*Mode-specific function which line breaks and continues a comment. |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4978 This function is called during auto-filling when a comment syntax |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4979 is defined. |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4980 The function should take a single optional argument, which is a flag |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4981 indicating whether it should use soft newlines.") |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4982 |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4983 (defun default-indent-new-line (&optional soft) |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4984 "Break line at point and indent. |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4985 If a comment syntax is defined, call `comment-indent-new-line'. |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4986 |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4987 The inserted newline is marked hard if variable `use-hard-newlines' is true, |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4988 unless optional argument SOFT is non-nil." |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4989 (interactive) |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4990 (if comment-start |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4991 (funcall comment-line-break-function soft) |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4992 ;; Insert the newline before removing empty space so that markers |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4993 ;; get preserved better. |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4994 (if soft (insert-and-inherit ?\n) (newline 1)) |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4995 (save-excursion (forward-char -1) (delete-horizontal-space)) |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4996 (delete-horizontal-space) |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4997 |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4998 (if (and fill-prefix (not adaptive-fill-mode)) |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
4999 ;; Blindly trust a non-adaptive fill-prefix. |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
5000 (progn |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
5001 (indent-to-left-margin) |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
5002 (insert-before-markers-and-inherit fill-prefix)) |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
5003 |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
5004 (cond |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
5005 ;; If there's an adaptive prefix, use it unless we're inside |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
5006 ;; a comment and the prefix is not a comment starter. |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
5007 (fill-prefix |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
5008 (indent-to-left-margin) |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
5009 (insert-and-inherit fill-prefix)) |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
5010 ;; If we're not inside a comment, just try to indent. |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
5011 (t (indent-according-to-mode)))))) |
76cd87e9edd6
(default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents:
82140
diff
changeset
|
5012 |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
5013 (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
|
5014 "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
|
5015 Some major modes set this.") |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
5016 |
60645
b532848a1806
(auto-fill-function): Use the new :minor-mode-function property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60619
diff
changeset
|
5017 (put 'auto-fill-function :minor-mode-function 'auto-fill-mode) |
102813
2c37faeb7d5e
(auto-fill-function): Mark it as safe for nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102768
diff
changeset
|
5018 ;; `functions' and `hooks' are usually unsafe to set, but setting |
2c37faeb7d5e
(auto-fill-function): Mark it as safe for nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102768
diff
changeset
|
5019 ;; auto-fill-function to nil in a file-local setting is safe and |
2c37faeb7d5e
(auto-fill-function): Mark it as safe for nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102768
diff
changeset
|
5020 ;; can be useful to prevent auto-filling. |
2c37faeb7d5e
(auto-fill-function): Mark it as safe for nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102768
diff
changeset
|
5021 (put 'auto-fill-function 'safe-local-variable 'null) |
47346
8287dca5eb2d
(what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47316
diff
changeset
|
5022 ;; FIXME: turn into a proper minor mode. |
8287dca5eb2d
(what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47316
diff
changeset
|
5023 ;; Add a global minor mode version of it. |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
5024 (defun auto-fill-mode (&optional arg) |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
5025 "Toggle Auto Fill mode. |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
5026 With ARG, turn Auto Fill mode on if and only if ARG is positive. |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
5027 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
|
5028 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
|
5029 |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
5030 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
|
5031 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
|
5032 (interactive "P") |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
5033 (prog1 (setq auto-fill-function |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
5034 (if (if (null arg) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
5035 (not auto-fill-function) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
5036 (> (prefix-numeric-value arg) 0)) |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
5037 normal-auto-fill-function |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
5038 nil)) |
11572
09d49f6e0af9
(auto-fill-mode): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents:
11479
diff
changeset
|
5039 (force-mode-line-update))) |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
5040 |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
5041 ;; 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
|
5042 (defun auto-fill-function () |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
5043 "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
|
5044 nil) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
5045 |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
5046 (defun turn-on-auto-fill () |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
5047 "Unconditionally turn on Auto Fill mode." |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
5048 (auto-fill-mode 1)) |
29808
fa2c8534a53a
(turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29345
diff
changeset
|
5049 |
fa2c8534a53a
(turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29345
diff
changeset
|
5050 (defun turn-off-auto-fill () |
fa2c8534a53a
(turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29345
diff
changeset
|
5051 "Unconditionally turn off Auto Fill mode." |
fa2c8534a53a
(turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29345
diff
changeset
|
5052 (auto-fill-mode -1)) |
fa2c8534a53a
(turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29345
diff
changeset
|
5053 |
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
|
5054 (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
|
5055 |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
5056 (defun set-fill-column (arg) |
15431
68cca71d69bd
(set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents:
15305
diff
changeset
|
5057 "Set `fill-column' to specified argument. |
23447
7ccd43d053fd
(set-fill-column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23251
diff
changeset
|
5058 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
|
5059 Just \\[universal-argument] as argument means to use the current column." |
93662
3f94f995598c
(set-fill-column): Prompt rather than error by default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93609
diff
changeset
|
5060 (interactive |
3f94f995598c
(set-fill-column): Prompt rather than error by default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93609
diff
changeset
|
5061 (list (or current-prefix-arg |
3f94f995598c
(set-fill-column): Prompt rather than error by default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93609
diff
changeset
|
5062 ;; We used to use current-column silently, but C-x f is too easily |
3f94f995598c
(set-fill-column): Prompt rather than error by default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93609
diff
changeset
|
5063 ;; typed as a typo for C-x C-f, so we turned it into an error and |
3f94f995598c
(set-fill-column): Prompt rather than error by default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93609
diff
changeset
|
5064 ;; now an interactive prompt. |
3f94f995598c
(set-fill-column): Prompt rather than error by default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93609
diff
changeset
|
5065 (read-number "Set fill-column to: " (current-column))))) |
17874
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
5066 (if (consp arg) |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
5067 (setq arg (current-column))) |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
5068 (if (not (integerp arg)) |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
5069 ;; Disallow missing argument; it's probably a typo for C-x C-f. |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
5070 (error "set-fill-column requires an explicit argument") |
17874
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
5071 (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
|
5072 (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
|
5073 |
475 | 5074 (defun set-selective-display (arg) |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
5075 "Set `selective-display' to ARG; clear it if no arg. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
5076 When the value of `selective-display' is a number > 0, |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
5077 lines whose indentation is >= that value are not displayed. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
5078 The variable `selective-display' has a separate value for each buffer." |
475 | 5079 (interactive "P") |
5080 (if (eq selective-display t) | |
5081 (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
|
5082 (let ((current-vpos |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
5083 (save-restriction |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
5084 (narrow-to-region (point-min) (point)) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
5085 (goto-char (window-start)) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
5086 (vertical-motion (window-height))))) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
5087 (setq selective-display |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
5088 (and arg (prefix-numeric-value arg))) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
5089 (recenter current-vpos)) |
475 | 5090 (set-window-start (selected-window) (window-start (selected-window))) |
5091 (princ "selective-display set to " t) | |
5092 (prin1 selective-display t) | |
5093 (princ "." t)) | |
5094 | |
48406
e670dd0e8087
(indicate-unused-lines, default-indicate-unused-lines): New variable aliases.
Richard M. Stallman <rms@gnu.org>
parents:
48234
diff
changeset
|
5095 (defvaralias 'indicate-unused-lines 'indicate-empty-lines) |
e670dd0e8087
(indicate-unused-lines, default-indicate-unused-lines): New variable aliases.
Richard M. Stallman <rms@gnu.org>
parents:
48234
diff
changeset
|
5096 |
70959
23bc72ff5e31
(toggle-truncate-lines): Make arg optional for
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70842
diff
changeset
|
5097 (defun toggle-truncate-lines (&optional arg) |
74392
391c63d1de1c
(toggle-truncate-lines): Clarify doc string.
Nick Roberts <nickrob@snap.net.nz>
parents:
74283
diff
changeset
|
5098 "Toggle whether to fold or truncate long lines for the current buffer. |
78492
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5099 With prefix argument ARG, truncate long lines if ARG is positive, |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
5100 otherwise don't truncate them. Note that in side-by-side windows, |
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
5101 this command has no effect if `truncate-partial-width-windows' |
93958
22a31e3179e0
(toggle-truncate-lines): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
93662
diff
changeset
|
5102 is non-nil." |
46175
9fa0c9140afa
2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
46092
diff
changeset
|
5103 (interactive "P") |
9fa0c9140afa
2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
46092
diff
changeset
|
5104 (setq truncate-lines |
9fa0c9140afa
2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
46092
diff
changeset
|
5105 (if (null arg) |
9fa0c9140afa
2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
46092
diff
changeset
|
5106 (not truncate-lines) |
46872
543ab39f153c
(toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents:
46845
diff
changeset
|
5107 (> (prefix-numeric-value arg) 0))) |
543ab39f153c
(toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents:
46845
diff
changeset
|
5108 (force-mode-line-update) |
48013
d3416b0f856c
(toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents:
47599
diff
changeset
|
5109 (unless truncate-lines |
d3416b0f856c
(toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents:
47599
diff
changeset
|
5110 (let ((buffer (current-buffer))) |
d3416b0f856c
(toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents:
47599
diff
changeset
|
5111 (walk-windows (lambda (window) |
d3416b0f856c
(toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents:
47599
diff
changeset
|
5112 (if (eq buffer (window-buffer window)) |
d3416b0f856c
(toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents:
47599
diff
changeset
|
5113 (set-window-hscroll window 0))) |
d3416b0f856c
(toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents:
47599
diff
changeset
|
5114 nil t))) |
46872
543ab39f153c
(toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents:
46845
diff
changeset
|
5115 (message "Truncate long lines %s" |
543ab39f153c
(toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents:
46845
diff
changeset
|
5116 (if truncate-lines "enabled" "disabled"))) |
46175
9fa0c9140afa
2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
46092
diff
changeset
|
5117 |
101897
d08c7c69fefe
(toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents:
101849
diff
changeset
|
5118 (defun toggle-word-wrap (&optional arg) |
d08c7c69fefe
(toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents:
101849
diff
changeset
|
5119 "Toggle whether to use word-wrapping for continuation lines. |
d08c7c69fefe
(toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents:
101849
diff
changeset
|
5120 With prefix argument ARG, wrap continuation lines at word boundaries |
d08c7c69fefe
(toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents:
101849
diff
changeset
|
5121 if ARG is positive, otherwise wrap them at the right screen edge. |
d08c7c69fefe
(toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents:
101849
diff
changeset
|
5122 This command toggles the value of `word-wrap'. It has no effect |
d08c7c69fefe
(toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents:
101849
diff
changeset
|
5123 if long lines are truncated." |
d08c7c69fefe
(toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents:
101849
diff
changeset
|
5124 (interactive "P") |
d08c7c69fefe
(toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents:
101849
diff
changeset
|
5125 (setq word-wrap |
d08c7c69fefe
(toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents:
101849
diff
changeset
|
5126 (if (null arg) |
d08c7c69fefe
(toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents:
101849
diff
changeset
|
5127 (not word-wrap) |
d08c7c69fefe
(toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents:
101849
diff
changeset
|
5128 (> (prefix-numeric-value arg) 0))) |
d08c7c69fefe
(toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents:
101849
diff
changeset
|
5129 (force-mode-line-update) |
d08c7c69fefe
(toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents:
101849
diff
changeset
|
5130 (message "Word wrapping %s" |
d08c7c69fefe
(toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents:
101849
diff
changeset
|
5131 (if word-wrap "enabled" "disabled"))) |
d08c7c69fefe
(toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents:
101849
diff
changeset
|
5132 |
17471
f383bfae3202
(overwrite-mode-binary, overwrite-mode-textual): Use defvar.
Richard M. Stallman <rms@gnu.org>
parents:
17355
diff
changeset
|
5133 (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
|
5134 "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
|
5135 (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
|
5136 "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
|
5137 |
475 | 5138 (defun overwrite-mode (arg) |
5139 "Toggle overwrite mode. | |
78492
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5140 With prefix argument ARG, turn overwrite mode on if ARG is positive, |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5141 otherwise turn it off. In overwrite mode, printing characters typed |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5142 in replace existing text on a one-for-one basis, rather than pushing |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5143 it to the right. At the end of a line, such characters extend the line. |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5144 Before a tab, such characters insert until the tab is filled in. |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
5145 \\[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
|
5146 is supposed to make it easier to insert characters when necessary." |
475 | 5147 (interactive "P") |
5148 (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
|
5149 (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
|
5150 (> (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
|
5151 '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
|
5152 (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
|
5153 |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
5154 (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
|
5155 "Toggle binary overwrite mode. |
78492
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5156 With prefix argument ARG, turn binary overwrite mode on if ARG is |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5157 positive, otherwise turn it off. In binary overwrite mode, printing |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5158 characters typed in replace existing text. Newlines are not treated |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5159 specially, so typing at the end of a line joins the line to the next, |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5160 with the typed character between them. Typing before a tab character |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5161 simply replaces the tab with the character typed. \\[quoted-insert] |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5162 replaces the text at the cursor, just as ordinary typing characters do. |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
5163 |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
5164 Note that binary overwrite mode is not its own minor mode; it is a |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
5165 specialization of overwrite mode, entered by setting the |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
5166 `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
|
5167 (interactive "P") |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
5168 (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
|
5169 (if (if (null arg) |
2301
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
5170 (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
|
5171 (> (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
|
5172 '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
|
5173 (force-mode-line-update)) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
5174 |
47408
2239db3433ca
(transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47364
diff
changeset
|
5175 (define-minor-mode line-number-mode |
2301
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
5176 "Toggle Line Number mode. |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
5177 With ARG, turn Line Number mode on if ARG is positive, otherwise |
78492
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5178 turn it off. When Line Number mode is enabled, the line number |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5179 appears in the mode line. |
23660 | 5180 |
38908
f917490db0d6
(line-number-mode): Mention the variable line-number-display-limit-width
Eli Zaretskii <eliz@gnu.org>
parents:
38847
diff
changeset
|
5181 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
|
5182 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
|
5183 and `line-number-display-limit-width'." |
72880
56bb239a5814
(line-number-mode): Group mode-line instead of editing-basics.
Richard M. Stallman <rms@gnu.org>
parents:
72853
diff
changeset
|
5184 :init-value t :global t :group 'mode-line) |
47408
2239db3433ca
(transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47364
diff
changeset
|
5185 |
2239db3433ca
(transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47364
diff
changeset
|
5186 (define-minor-mode column-number-mode |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
5187 "Toggle Column Number mode. |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
5188 With ARG, turn Column Number mode on if ARG is positive, |
78492
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5189 otherwise turn it off. When Column Number mode is enabled, the |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5190 column number appears in the mode line." |
72880
56bb239a5814
(line-number-mode): Group mode-line instead of editing-basics.
Richard M. Stallman <rms@gnu.org>
parents:
72853
diff
changeset
|
5191 :global t :group 'mode-line) |
52464 | 5192 |
5193 (define-minor-mode size-indication-mode | |
5194 "Toggle Size Indication mode. | |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
5195 With ARG, turn Size Indication mode on if ARG is positive, |
78492
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5196 otherwise turn it off. When Size Indication mode is enabled, the |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5197 size of the accessible part of the buffer appears in the mode line." |
72880
56bb239a5814
(line-number-mode): Group mode-line instead of editing-basics.
Richard M. Stallman <rms@gnu.org>
parents:
72853
diff
changeset
|
5198 :global t :group 'mode-line) |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
5199 |
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
|
5200 (defgroup paren-blinking nil |
18379
1dd6f63f0ea3
(paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18334
diff
changeset
|
5201 "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
|
5202 :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
|
5203 :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
|
5204 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5205 (defcustom blink-matching-paren t |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
5206 "Non-nil means show matching open-paren when close-paren is inserted." |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5207 :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
|
5208 :group 'paren-blinking) |
475 | 5209 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5210 (defcustom blink-matching-paren-on-screen t |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
5211 "Non-nil means show matching open-paren when it is on screen. |
75693
ee95fe58241e
(blink-matching-paren-dont-ignore-comments, blink-matching-paren-on-screen):
Juanma Barranquero <lekktu@gmail.com>
parents:
75468
diff
changeset
|
5212 If nil, don't show it (but the open-paren can still be shown |
67152
23ddbc106655
(blink-matching-open): Ignore `blink-matching-paren-on-screen' if
Luc Teirlinck <teirllm@auburn.edu>
parents:
67092
diff
changeset
|
5213 when it is off screen). |
23ddbc106655
(blink-matching-open): Ignore `blink-matching-paren-on-screen' if
Luc Teirlinck <teirllm@auburn.edu>
parents:
67092
diff
changeset
|
5214 |
67154
a90e7f4f4c45
(blink-matching-paren-on-screen): Further doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
67152
diff
changeset
|
5215 This variable has no effect if `blink-matching-paren' is nil. |
67155
30968a553175
(blink-matching-paren-on-screen): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
67154
diff
changeset
|
5216 \(In that case, the open-paren is never shown.) |
67154
a90e7f4f4c45
(blink-matching-paren-on-screen): Further doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
67152
diff
changeset
|
5217 It is also ignored if `show-paren-mode' is enabled." |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5218 :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
|
5219 :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
|
5220 |
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
5221 (defcustom blink-matching-paren-distance (* 25 1024) |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
5222 "If non-nil, maximum distance to search backwards for matching open-paren. |
65173
9398f33d6515
(blink-matching-paren-distance): Document the meaning of nil value,
Eli Zaretskii <eliz@gnu.org>
parents:
64991
diff
changeset
|
5223 If nil, search stops at the beginning of the accessible portion of the buffer." |
9398f33d6515
(blink-matching-paren-distance): Document the meaning of nil value,
Eli Zaretskii <eliz@gnu.org>
parents:
64991
diff
changeset
|
5224 :type '(choice (const nil) 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
|
5225 :group 'paren-blinking) |
475 | 5226 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5227 (defcustom blink-matching-delay 1 |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
5228 "Time in seconds to delay after showing a matching paren." |
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
|
5229 :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
|
5230 :group 'paren-blinking) |
9771
3a51735d4a55
(blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9750
diff
changeset
|
5231 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5232 (defcustom blink-matching-paren-dont-ignore-comments nil |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
5233 "If nil, `blink-matching-paren' ignores comments. |
68829
508732e39a9f
(blink-matching-paren-dont-ignore-comments): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68613
diff
changeset
|
5234 More precisely, when looking for the matching parenthesis, |
508732e39a9f
(blink-matching-paren-dont-ignore-comments): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68613
diff
changeset
|
5235 it skips the contents of comments that end before point." |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5236 :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
|
5237 :group 'paren-blinking) |
12893
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
5238 |
475 | 5239 (defun blink-matching-open () |
5240 "Move cursor momentarily to the beginning of the sexp before point." | |
5241 (interactive) | |
65698
c2427cf9fc77
(blink-matching-open): Don't no-op when point is BEGV+1.
Richard M. Stallman <rms@gnu.org>
parents:
65582
diff
changeset
|
5242 (when (and (> (point) (point-min)) |
65377
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
5243 blink-matching-paren |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
5244 ;; Verify an even number of quoting characters precede the close. |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
5245 (= 1 (logand 1 (- (point) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
5246 (save-excursion |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
5247 (forward-char -1) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
5248 (skip-syntax-backward "/\\") |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
5249 (point)))))) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
5250 (let* ((oldpos (point)) |
84609
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5251 (message-log-max nil) ; Don't log messages about paren matching. |
85322 | 5252 (atdollar (eq (syntax-class (syntax-after (1- oldpos))) 8)) |
5253 (isdollar) | |
84609
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5254 (blinkpos |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5255 (save-excursion |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5256 (save-restriction |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5257 (if blink-matching-paren-distance |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5258 (narrow-to-region |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5259 (max (minibuffer-prompt-end) ;(point-min) unless minibuf. |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5260 (- (point) blink-matching-paren-distance)) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5261 oldpos)) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5262 (let ((parse-sexp-ignore-comments |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5263 (and parse-sexp-ignore-comments |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5264 (not blink-matching-paren-dont-ignore-comments)))) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5265 (condition-case () |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5266 (scan-sexps oldpos -1) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5267 (error nil)))))) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5268 (matching-paren |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5269 (and blinkpos |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5270 ;; Not syntax '$'. |
85322 | 5271 (not (setq isdollar |
5272 (eq (syntax-class (syntax-after blinkpos)) 8))) | |
84609
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5273 (let ((syntax (syntax-after blinkpos))) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5274 (and (consp syntax) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5275 (eq (syntax-class syntax) 4) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5276 (cdr syntax)))))) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5277 (cond |
85322 | 5278 ;; isdollar is for: |
5279 ;; http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg00871.html | |
5280 ((not (or (and isdollar blinkpos) | |
5281 (and atdollar (not blinkpos)) ; see below | |
5282 (eq matching-paren (char-before oldpos)) | |
84609
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5283 ;; The cdr might hold a new paren-class info rather than |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5284 ;; a matching-char info, in which case the two CDRs |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5285 ;; should match. |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5286 (eq matching-paren (cdr (syntax-after (1- oldpos)))))) |
101181
a0e232b151fb
(blink-matching-open): Use `minibuffer-message' to
Juri Linkov <juri@jurta.org>
parents:
101010
diff
changeset
|
5287 (if (minibufferp) |
a0e232b151fb
(blink-matching-open): Use `minibuffer-message' to
Juri Linkov <juri@jurta.org>
parents:
101010
diff
changeset
|
5288 (minibuffer-message " [Mismatched parentheses]") |
a0e232b151fb
(blink-matching-open): Use `minibuffer-message' to
Juri Linkov <juri@jurta.org>
parents:
101010
diff
changeset
|
5289 (message "Mismatched parentheses"))) |
84609
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5290 ((not blinkpos) |
85322 | 5291 (or blink-matching-paren-distance |
5292 ;; Don't complain when `$' with no blinkpos, because it | |
5293 ;; could just be the first one typed in the buffer. | |
5294 atdollar | |
101181
a0e232b151fb
(blink-matching-open): Use `minibuffer-message' to
Juri Linkov <juri@jurta.org>
parents:
101010
diff
changeset
|
5295 (if (minibufferp) |
a0e232b151fb
(blink-matching-open): Use `minibuffer-message' to
Juri Linkov <juri@jurta.org>
parents:
101010
diff
changeset
|
5296 (minibuffer-message " [Unmatched parenthesis]") |
a0e232b151fb
(blink-matching-open): Use `minibuffer-message' to
Juri Linkov <juri@jurta.org>
parents:
101010
diff
changeset
|
5297 (message "Unmatched parenthesis")))) |
84609
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5298 ((pos-visible-in-window-p blinkpos) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5299 ;; Matching open within window, temporarily move to blinkpos but only |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5300 ;; if `blink-matching-paren-on-screen' is non-nil. |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5301 (and blink-matching-paren-on-screen |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5302 (not show-paren-mode) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5303 (save-excursion |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5304 (goto-char blinkpos) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5305 (sit-for blink-matching-delay)))) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5306 (t |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5307 (save-excursion |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5308 (goto-char blinkpos) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5309 (let ((open-paren-line-string |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5310 ;; Show what precedes the open in its line, if anything. |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5311 (cond |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5312 ((save-excursion (skip-chars-backward " \t") (not (bolp))) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5313 (buffer-substring (line-beginning-position) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5314 (1+ blinkpos))) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5315 ;; Show what follows the open in its line, if anything. |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5316 ((save-excursion |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5317 (forward-char 1) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5318 (skip-chars-forward " \t") |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5319 (not (eolp))) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5320 (buffer-substring blinkpos |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5321 (line-end-position))) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5322 ;; Otherwise show the previous nonblank line, |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5323 ;; if there is one. |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5324 ((save-excursion (skip-chars-backward "\n \t") (not (bobp))) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5325 (concat |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5326 (buffer-substring (progn |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5327 (skip-chars-backward "\n \t") |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5328 (line-beginning-position)) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5329 (progn (end-of-line) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5330 (skip-chars-backward " \t") |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5331 (point))) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5332 ;; Replace the newline and other whitespace with `...'. |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5333 "..." |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5334 (buffer-substring blinkpos (1+ blinkpos)))) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5335 ;; There is nothing to show except the char itself. |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5336 (t (buffer-substring blinkpos (1+ blinkpos)))))) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5337 (message "Matches %s" |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5338 (substring-no-properties open-paren-line-string))))))))) |
653c328271e7
(newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
84381
diff
changeset
|
5339 |
475 | 5340 (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
|
5341 |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
5342 ;; 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
|
5343 ;; 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
|
5344 ;; that happens in the QUIT macro at the C code level. |
475 | 5345 (defun keyboard-quit () |
22304 | 5346 "Signal a `quit' condition. |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
5347 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
|
5348 At top-level, as an editor command, this simply beeps." |
475 | 5349 (interactive) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
5350 (deactivate-mark) |
57853
d50014ac219f
(keyboard-quit): Call kmacro-keyboard-quit.
Kim F. Storm <storm@cua.dk>
parents:
57688
diff
changeset
|
5351 (if (fboundp 'kmacro-keyboard-quit) |
d50014ac219f
(keyboard-quit): Call kmacro-keyboard-quit.
Kim F. Storm <storm@cua.dk>
parents:
57688
diff
changeset
|
5352 (kmacro-keyboard-quit)) |
47353
6979a589f9c7
(keyboard-quit): Set defining-kbd-macro to nil to
Kim F. Storm <storm@cua.dk>
parents:
47346
diff
changeset
|
5353 (setq defining-kbd-macro nil) |
475 | 5354 (signal 'quit nil)) |
5355 | |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
5356 (defvar buffer-quit-function nil |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
5357 "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
|
5358 \\[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
|
5359 \(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
|
5360 |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
5361 (defun keyboard-escape-quit () |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
5362 "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
|
5363 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
|
5364 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
|
5365 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
|
5366 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
|
5367 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
|
5368 (interactive) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
5369 (cond ((eq last-command 'mode-exited) nil) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
5370 ((> (minibuffer-depth) 0) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
5371 (abort-recursive-edit)) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
5372 (current-prefix-arg |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
5373 nil) |
93561
e39e5bb86d6b
(beginning-of-buffer, end-of-buffer, goto-line, undo)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93548
diff
changeset
|
5374 ((region-active-p) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
5375 (deactivate-mark)) |
17355
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
5376 ((> (recursion-depth) 0) |
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
5377 (exit-recursive-edit)) |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
5378 (buffer-quit-function |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
5379 (funcall buffer-quit-function)) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
5380 ((not (one-window-p t)) |
17355
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
5381 (delete-other-windows)) |
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
5382 ((string-match "^ \\*" (buffer-name (current-buffer))) |
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
5383 (bury-buffer)))) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
5384 |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
5385 (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
|
5386 "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
|
5387 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
|
5388 specification for `play-sound'." |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
5389 (interactive "fPlay sound file: ") |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
5390 (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
|
5391 (if volume |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
5392 (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
|
5393 (if device |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
5394 (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
|
5395 (push 'sound sound) |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
5396 (play-sound sound))) |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
5397 |
59567
638fd0a9f545
(just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents:
59486
diff
changeset
|
5398 |
27234
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
5399 (defcustom read-mail-command 'rmail |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
5400 "Your preference for a mail reading package. |
31573 | 5401 This is used by some keybindings which support reading mail. |
5402 See also `mail-user-agent' concerning sending mail." | |
27234
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
5403 :type '(choice (function-item rmail) |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
5404 (function-item gnus) |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
5405 (function-item mh-rmail) |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
5406 (function :tag "Other")) |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
5407 :version "21.1" |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
5408 :group 'mail) |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
5409 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5410 (defcustom mail-user-agent 'sendmail-user-agent |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
5411 "Your preference for a mail composition package. |
31573 | 5412 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
|
5413 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
|
5414 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
|
5415 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
5416 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
|
5417 |
31573 | 5418 `sendmail-user-agent' -- use the default Emacs Mail package. |
5419 See Info node `(emacs)Sending Mail'. | |
5420 `mh-e-user-agent' -- use the Emacs interface to the MH mail system. | |
5421 See Info node `(mh-e)'. | |
5422 `message-user-agent' -- use the Gnus Message package. | |
5423 See Info node `(message)'. | |
5424 `gnus-user-agent' -- like `message-user-agent', but with Gnus | |
5425 paraphernalia, particularly the Gcc: header for | |
5426 archiving. | |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
5427 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
5428 Additional valid symbols may be available; check with the author of |
34687 | 5429 your package for details. The function should return non-nil if it |
5430 succeeds. | |
31573 | 5431 |
5432 See also `read-mail-command' concerning reading mail." | |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5433 :type '(radio (function-item :tag "Default Emacs mail" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5434 :format "%t\n" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5435 sendmail-user-agent) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5436 (function-item :tag "Emacs interface to MH" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5437 :format "%t\n" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5438 mh-e-user-agent) |
31573 | 5439 (function-item :tag "Gnus Message package" |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5440 :format "%t\n" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5441 message-user-agent) |
31573 | 5442 (function-item :tag "Gnus Message with full Gnus features" |
5443 :format "%t\n" | |
5444 gnus-user-agent) | |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5445 (function :tag "Other")) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
5446 :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
|
5447 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
5448 (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
|
5449 '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
|
5450 '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
|
5451 |
21906
2ee50035ee1b
(rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents:
21847
diff
changeset
|
5452 (defun rfc822-goto-eoh () |
2ee50035ee1b
(rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents:
21847
diff
changeset
|
5453 ;; 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
|
5454 (goto-char (point-min)) |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
5455 (when (re-search-forward |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
5456 "^\\([:\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
|
5457 (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
|
5458 |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
5459 (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
|
5460 switch-function yank-action |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
5461 send-actions) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
5462 (if switch-function |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
5463 (let ((special-display-buffer-names nil) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
5464 (special-display-regexps nil) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
5465 (same-window-buffer-names nil) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
5466 (same-window-regexps nil)) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
5467 (funcall switch-function "*mail*"))) |
53411
f0c057d16a15
(sendmail-user-agent-compose): Use assoc-string.
Richard M. Stallman <rms@gnu.org>
parents:
53097
diff
changeset
|
5468 (let ((cc (cdr (assoc-string "cc" other-headers t))) |
f0c057d16a15
(sendmail-user-agent-compose): Use assoc-string.
Richard M. Stallman <rms@gnu.org>
parents:
53097
diff
changeset
|
5469 (in-reply-to (cdr (assoc-string "in-reply-to" other-headers t))) |
f0c057d16a15
(sendmail-user-agent-compose): Use assoc-string.
Richard M. Stallman <rms@gnu.org>
parents:
53097
diff
changeset
|
5470 (body (cdr (assoc-string "body" other-headers t)))) |
65521
4de96b605e55
2005-09-15 Chong Yidong <cyd@stupidchicken.com>
Chong Yidong <cyd@stupidchicken.com>
parents:
65482
diff
changeset
|
5471 (or (mail continue to subject in-reply-to cc yank-action send-actions) |
4de96b605e55
2005-09-15 Chong Yidong <cyd@stupidchicken.com>
Chong Yidong <cyd@stupidchicken.com>
parents:
65482
diff
changeset
|
5472 continue |
4de96b605e55
2005-09-15 Chong Yidong <cyd@stupidchicken.com>
Chong Yidong <cyd@stupidchicken.com>
parents:
65482
diff
changeset
|
5473 (error "Message aborted")) |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
5474 (save-excursion |
21906
2ee50035ee1b
(rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents:
21847
diff
changeset
|
5475 (rfc822-goto-eoh) |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
5476 (while other-headers |
28491
3e21859cd0e7
(sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents:
28193
diff
changeset
|
5477 (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
|
5478 '("in-reply-to" "cc" "body")) |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
5479 (insert (car (car other-headers)) ": " |
67213
818361523ce8
* longlines.el (longlines-mode): Add mail-setup-hook.
Chong Yidong <cyd@stupidchicken.com>
parents:
67181
diff
changeset
|
5480 (cdr (car other-headers)) |
818361523ce8
* longlines.el (longlines-mode): Add mail-setup-hook.
Chong Yidong <cyd@stupidchicken.com>
parents:
67181
diff
changeset
|
5481 (if use-hard-newlines hard-newline "\n"))) |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
5482 (setq other-headers (cdr other-headers))) |
28491
3e21859cd0e7
(sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents:
28193
diff
changeset
|
5483 (when body |
3e21859cd0e7
(sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents:
28193
diff
changeset
|
5484 (forward-line 1) |
3e21859cd0e7
(sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents:
28193
diff
changeset
|
5485 (insert body)) |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
5486 t))) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
5487 |
16632
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
5488 (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
|
5489 switch-function yank-action send-actions) |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
5490 "Start composing a mail message to send. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
5491 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
|
5492 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
|
5493 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
|
5494 and the initial Subject field, respectively. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
5495 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
5496 OTHER-HEADERS is an alist specifying additional |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
5497 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
|
5498 HEADER and VALUE are strings. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
5499 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
5500 CONTINUE, if non-nil, says to continue editing a message already |
102467 | 5501 being composed. Interactively, CONTINUE is the prefix argument. |
16632
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
5502 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
5503 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
|
5504 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
|
5505 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
5506 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
|
5507 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
|
5508 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
|
5509 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
|
5510 \(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
|
5511 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
|
5512 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
5513 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
|
5514 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
|
5515 (interactive |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
5516 (list nil nil nil current-prefix-arg)) |
76785
bb2e03ff11bc
(next-error-highlight): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
76634
diff
changeset
|
5517 (let ((function (get mail-user-agent 'composefunc))) |
bb2e03ff11bc
(next-error-highlight): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
76634
diff
changeset
|
5518 (funcall function to subject other-headers continue |
bb2e03ff11bc
(next-error-highlight): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
76634
diff
changeset
|
5519 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
|
5520 |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
5521 (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
|
5522 yank-action send-actions) |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
5523 "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
|
5524 (interactive |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
5525 (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
|
5526 (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
|
5527 '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
|
5528 |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
5529 |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
5530 (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
|
5531 yank-action send-actions) |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
5532 "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
|
5533 (interactive |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
5534 (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
|
5535 (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
|
5536 'switch-to-buffer-other-frame yank-action send-actions)) |
59567
638fd0a9f545
(just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents:
59486
diff
changeset
|
5537 |
17606
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
5538 (defvar set-variable-value-history nil |
79599
a00fd366de50
(set-variable-value-history): Add reference to history-length in
Eli Zaretskii <eliz@gnu.org>
parents:
79598
diff
changeset
|
5539 "History of values entered with `set-variable'. |
a00fd366de50
(set-variable-value-history): Add reference to history-length in
Eli Zaretskii <eliz@gnu.org>
parents:
79598
diff
changeset
|
5540 |
a00fd366de50
(set-variable-value-history): Add reference to history-length in
Eli Zaretskii <eliz@gnu.org>
parents:
79598
diff
changeset
|
5541 Maximum length of the history list is determined by the value |
a00fd366de50
(set-variable-value-history): Add reference to history-length in
Eli Zaretskii <eliz@gnu.org>
parents:
79598
diff
changeset
|
5542 of `history-length', which see.") |
17606
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
5543 |
63717
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
5544 (defun set-variable (variable value &optional make-local) |
17606
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
5545 "Set VARIABLE to VALUE. VALUE is a Lisp object. |
63717
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
5546 VARIABLE should be a user option variable name, a Lisp variable |
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
5547 meant to be customized by users. You should enter VALUE in Lisp syntax, |
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
5548 so if you want VALUE to be a string, you must surround it with doublequotes. |
17606
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
5549 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
|
5550 |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
5551 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
|
5552 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
|
5553 |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
5554 If VARIABLE has been defined with `defcustom', then the type information |
46845
e06b5768debd
(set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents:
46647
diff
changeset
|
5555 in the definition is used to check that VALUE is valid. |
e06b5768debd
(set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents:
46647
diff
changeset
|
5556 |
e06b5768debd
(set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents:
46647
diff
changeset
|
5557 With a prefix argument, set VARIABLE to VALUE buffer-locally." |
22157
7c92848a9d80
(set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents:
22144
diff
changeset
|
5558 (interactive |
7c92848a9d80
(set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents:
22144
diff
changeset
|
5559 (let* ((default-var (variable-at-point)) |
66281
3213e48ea8b3
(set-variable): Use user-variable-p instead of symbolp.
Juri Linkov <juri@jurta.org>
parents:
66114
diff
changeset
|
5560 (var (if (user-variable-p default-var) |
3213e48ea8b3
(set-variable): Use user-variable-p instead of symbolp.
Juri Linkov <juri@jurta.org>
parents:
66114
diff
changeset
|
5561 (read-variable (format "Set variable (default %s): " default-var) |
3213e48ea8b3
(set-variable): Use user-variable-p instead of symbolp.
Juri Linkov <juri@jurta.org>
parents:
66114
diff
changeset
|
5562 default-var) |
3213e48ea8b3
(set-variable): Use user-variable-p instead of symbolp.
Juri Linkov <juri@jurta.org>
parents:
66114
diff
changeset
|
5563 (read-variable "Set variable: "))) |
53097
bb31cf348e05
(set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
52966
diff
changeset
|
5564 (minibuffer-help-form '(describe-variable var)) |
bb31cf348e05
(set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
52966
diff
changeset
|
5565 (prop (get var 'variable-interactive)) |
63866
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5566 (obsolete (car (get var 'byte-obsolete-variable))) |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5567 (prompt (format "Set %s %s to value: " var |
53097
bb31cf348e05
(set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
52966
diff
changeset
|
5568 (cond ((local-variable-p var) |
63866
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5569 "(buffer-local)") |
53097
bb31cf348e05
(set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
52966
diff
changeset
|
5570 ((or current-prefix-arg |
bb31cf348e05
(set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
52966
diff
changeset
|
5571 (local-variable-if-set-p var)) |
63866
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5572 "buffer-locally") |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5573 (t "globally")))) |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5574 (val (progn |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5575 (when obsolete |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5576 (message (concat "`%S' is obsolete; " |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5577 (if (symbolp obsolete) "use `%S' instead" "%s")) |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5578 var obsolete) |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5579 (sit-for 3)) |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5580 (if prop |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5581 ;; Use VAR's `variable-interactive' property |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5582 ;; as an interactive spec for prompting. |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5583 (call-interactively `(lambda (arg) |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5584 (interactive ,prop) |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5585 arg)) |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5586 (read |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
5587 (read-string prompt nil |
66281
3213e48ea8b3
(set-variable): Use user-variable-p instead of symbolp.
Juri Linkov <juri@jurta.org>
parents:
66114
diff
changeset
|
5588 'set-variable-value-history |
3213e48ea8b3
(set-variable): Use user-variable-p instead of symbolp.
Juri Linkov <juri@jurta.org>
parents:
66114
diff
changeset
|
5589 (format "%S" (symbol-value var)))))))) |
53097
bb31cf348e05
(set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
52966
diff
changeset
|
5590 (list var val current-prefix-arg))) |
17606
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
5591 |
63717
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
5592 (and (custom-variable-p variable) |
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
5593 (not (get variable 'custom-type)) |
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
5594 (custom-load-symbol variable)) |
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
5595 (let ((type (get variable 'custom-type))) |
17606
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
5596 (when type |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
5597 ;; Match with custom type. |
38432
4bbb59858499
(set-variable): Require 'cus-edit' instead of
Gerd Moellmann <gerd@gnu.org>
parents:
38027
diff
changeset
|
5598 (require 'cus-edit) |
17606
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
5599 (setq type (widget-convert type)) |
63717
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
5600 (unless (widget-apply type :match value) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
5601 (error "Value `%S' does not match type %S of %S" |
63717
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
5602 value (car type) variable)))) |
46845
e06b5768debd
(set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents:
46647
diff
changeset
|
5603 |
e06b5768debd
(set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents:
46647
diff
changeset
|
5604 (if make-local |
63717
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
5605 (make-local-variable variable)) |
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
5606 |
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
5607 (set variable value) |
35203
dcf1f0621dbb
(set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents:
34909
diff
changeset
|
5608 |
dcf1f0621dbb
(set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents:
34909
diff
changeset
|
5609 ;; 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
|
5610 ;; 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
|
5611 (force-mode-line-update)) |
59567
638fd0a9f545
(just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents:
59486
diff
changeset
|
5612 |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
5613 ;; Define the major mode for lists of completions. |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
5614 |
94062
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5615 (defvar completion-list-mode-map |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5616 (let ((map (make-sparse-keymap))) |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5617 (define-key map [mouse-2] 'mouse-choose-completion) |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5618 (define-key map [follow-link] 'mouse-face) |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5619 (define-key map [down-mouse-2] nil) |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5620 (define-key map "\C-m" 'choose-completion) |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5621 (define-key map "\e\e\e" 'delete-completion-window) |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5622 (define-key map [left] 'previous-completion) |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5623 (define-key map [right] 'next-completion) |
102867
8a809181875d
(completion-list-mode-map): Bind "q" to quit-window,
Sam Steingold <sds@gnu.org>
parents:
102856
diff
changeset
|
5624 (define-key map "q" 'quit-window) |
94062
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5625 map) |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
5626 "Local map for completion list buffers.") |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
5627 |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
5628 ;; 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
|
5629 (put 'completion-list-mode 'mode-class 'special) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
5630 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
5631 (defvar completion-reference-buffer nil |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
5632 "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
|
5633 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
|
5634 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
|
5635 |
16924
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
5636 (defvar completion-no-auto-exit nil |
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
5637 "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
|
5638 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
|
5639 and `mouse-choose-completion'.") |
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
5640 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
5641 (defvar completion-base-size nil |
97475
2ac804a70140
(completion-base-size): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
97438
diff
changeset
|
5642 "Number of chars before point not involved in completion. |
2ac804a70140
(completion-base-size): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
97438
diff
changeset
|
5643 This is a local variable in the completion list buffer. |
2ac804a70140
(completion-base-size): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
97438
diff
changeset
|
5644 It refers to the chars in the minibuffer if completing in the |
2ac804a70140
(completion-base-size): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
97438
diff
changeset
|
5645 minibuffer, or in `completion-reference-buffer' otherwise. |
2ac804a70140
(completion-base-size): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
97438
diff
changeset
|
5646 Only characters in the field at point are included. |
2ac804a70140
(completion-base-size): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
97438
diff
changeset
|
5647 |
2ac804a70140
(completion-base-size): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
97438
diff
changeset
|
5648 If nil, Emacs determines which part of the tail end of the |
2ac804a70140
(completion-base-size): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
97438
diff
changeset
|
5649 buffer's text is involved in completion by comparing the text |
2ac804a70140
(completion-base-size): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
97438
diff
changeset
|
5650 directly.") |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
5651 |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
5652 (defun delete-completion-window () |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
5653 "Delete the completion list window. |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
5654 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
|
5655 (interactive) |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
5656 (let ((buf completion-reference-buffer)) |
16851
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
5657 (if (one-window-p t) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
5658 (if (window-dedicated-p (selected-window)) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
5659 (delete-frame (selected-frame))) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
5660 (delete-window (selected-window)) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
5661 (if (get-buffer-window buf) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
5662 (select-window (get-buffer-window buf)))))) |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
5663 |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
5664 (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
|
5665 "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
|
5666 (interactive "p") |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
5667 (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
|
5668 |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
5669 (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
|
5670 "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
|
5671 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
|
5672 (interactive "p") |
33781
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
5673 (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
|
5674 (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
|
5675 ;; 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
|
5676 (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
|
5677 (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
|
5678 ;; 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
|
5679 (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
|
5680 (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
|
5681 (setq n (1- n))) |
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
5682 (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
|
5683 (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
|
5684 ;; 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
|
5685 (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
|
5686 (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
|
5687 (point) 'mouse-face nil beg))) |
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
5688 ;; 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
|
5689 (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
|
5690 (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
|
5691 (point) 'mouse-face nil beg))) |
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
5692 ;; 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
|
5693 (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
|
5694 (point) 'mouse-face nil beg)) |
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
5695 (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
|
5696 |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
5697 (defun choose-completion () |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
5698 "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
|
5699 (interactive) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
5700 (let (beg end completion (buffer completion-reference-buffer) |
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
5701 (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
|
5702 (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
|
5703 (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
|
5704 (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
|
5705 (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
|
5706 (if (null beg) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
5707 (error "No completion here")) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
5708 (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
|
5709 (setq end (or (next-single-property-change end 'mouse-face) (point-max))) |
67621
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5710 (setq completion (buffer-substring-no-properties beg end)) |
8468
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
5711 (let ((owindow (selected-window))) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
5712 (if (and (one-window-p t 'selected-frame) |
97481
d50fcbf5354d
(choose-completion): Try reselecting completion-reference-buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
97475
diff
changeset
|
5713 (window-dedicated-p owindow)) |
8468
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
5714 ;; 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
|
5715 (iconify-frame (selected-frame)) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
5716 (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
|
5717 (bury-buffer))) |
97481
d50fcbf5354d
(choose-completion): Try reselecting completion-reference-buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
97475
diff
changeset
|
5718 (select-window |
d50fcbf5354d
(choose-completion): Try reselecting completion-reference-buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
97475
diff
changeset
|
5719 (or (and (buffer-live-p buffer) |
d50fcbf5354d
(choose-completion): Try reselecting completion-reference-buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
97475
diff
changeset
|
5720 (get-buffer-window buffer)) |
d50fcbf5354d
(choose-completion): Try reselecting completion-reference-buffer.
Chong Yidong <cyd@stupidchicken.com>
parents:
97475
diff
changeset
|
5721 owindow))) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
5722 (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
|
5723 |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
5724 ;; 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
|
5725 ;; that can be found before POINT. |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
5726 (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
|
5727 (let ((opoint (point)) |
46516
25e7debccc64
(choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
46409
diff
changeset
|
5728 len) |
25e7debccc64
(choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
46409
diff
changeset
|
5729 ;; Try moving back by the length of the string. |
25e7debccc64
(choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
46409
diff
changeset
|
5730 (goto-char (max (- (point) (length string)) |
25e7debccc64
(choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
46409
diff
changeset
|
5731 (minibuffer-prompt-end))) |
25e7debccc64
(choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
46409
diff
changeset
|
5732 ;; See how far back we were actually able to move. That is the |
25e7debccc64
(choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
46409
diff
changeset
|
5733 ;; upper bound on how much we can match and delete. |
25e7debccc64
(choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
46409
diff
changeset
|
5734 (setq len (- opoint (point))) |
7574
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
5735 (if completion-ignore-case |
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
5736 (setq string (downcase string))) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
5737 (while (and (> len 0) |
46516
25e7debccc64
(choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
46409
diff
changeset
|
5738 (let ((tail (buffer-substring (point) opoint))) |
7574
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
5739 (if completion-ignore-case |
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
5740 (setq tail (downcase tail))) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
5741 (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
|
5742 (setq len (1- len)) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
5743 (forward-char 1)) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
5744 (delete-char len))) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
5745 |
45607
98941f178aa2
(choose-completion-string-functions): New special hook.
Kim F. Storm <storm@cua.dk>
parents:
45586
diff
changeset
|
5746 (defvar choose-completion-string-functions nil |
45612 | 5747 "Functions that may override the normal insertion of a completion choice. |
5748 These functions are called in order with four arguments: | |
5749 CHOICE - the string to insert in the buffer, | |
5750 BUFFER - the buffer in which the choice should be inserted, | |
78492
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
5751 MINI-P - non-nil if BUFFER is a minibuffer, and |
45615
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
5752 BASE-SIZE - the number of characters in BUFFER before |
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
5753 the string being completed. |
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
5754 |
45612 | 5755 If a function in the list returns non-nil, that function is supposed |
5756 to have inserted the CHOICE in the BUFFER, and possibly exited | |
45615
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
5757 the minibuffer; no further functions will be called. |
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
5758 |
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
5759 If all functions in the list return nil, that means to use |
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
5760 the default method of inserting the completion in BUFFER.") |
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
5761 |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
5762 (defun choose-completion-string (choice &optional buffer base-size) |
45615
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
5763 "Switch to BUFFER and insert the completion choice CHOICE. |
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
5764 BASE-SIZE, if non-nil, says how many characters of BUFFER's text |
46409
cb5bcb2c81ee
(choose-completion-string): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
46175
diff
changeset
|
5765 to keep. If it is nil, we call `choose-completion-delete-max-match' |
cb5bcb2c81ee
(choose-completion-string): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
46175
diff
changeset
|
5766 to decide what to delete." |
45615
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
5767 |
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
5768 ;; If BUFFER is the minibuffer, exit the minibuffer |
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
5769 ;; unless it is reading a file name and CHOICE is a directory, |
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
5770 ;; or completion-no-auto-exit is non-nil. |
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
5771 |
52046
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
5772 (let* ((buffer (or buffer completion-reference-buffer)) |
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
5773 (mini-p (minibufferp buffer))) |
7333
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
5774 ;; 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
|
5775 ;; active minibuffer. |
27050
5c0c5089979c
(choose-completion-string): In minibuffer,
Richard M. Stallman <rms@gnu.org>
parents:
26884
diff
changeset
|
5776 (if (and mini-p |
11159
edf66df6fbe9
(choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
11140
diff
changeset
|
5777 (or (not (active-minibuffer-window)) |
edf66df6fbe9
(choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
11140
diff
changeset
|
5778 (not (equal buffer |
edf66df6fbe9
(choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
11140
diff
changeset
|
5779 (window-buffer (active-minibuffer-window)))))) |
7333
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
5780 (error "Minibuffer is not active for completion") |
57069
eadbbac38074
(choose-completion-string): Set buffer before running
Kim F. Storm <storm@cua.dk>
parents:
56943
diff
changeset
|
5781 ;; Set buffer so buffer-local choose-completion-string-functions works. |
eadbbac38074
(choose-completion-string): Set buffer before running
Kim F. Storm <storm@cua.dk>
parents:
56943
diff
changeset
|
5782 (set-buffer buffer) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49585
diff
changeset
|
5783 (unless (run-hook-with-args-until-success |
47346
8287dca5eb2d
(what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47316
diff
changeset
|
5784 'choose-completion-string-functions |
8287dca5eb2d
(what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47316
diff
changeset
|
5785 choice buffer mini-p base-size) |
8287dca5eb2d
(what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47316
diff
changeset
|
5786 ;; Insert the completion into the buffer where it was requested. |
94464
66b02cd7b956
* minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94381
diff
changeset
|
5787 ;; FIXME: |
66b02cd7b956
* minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94381
diff
changeset
|
5788 ;; - There may not be a field at point, or there may be a field but |
66b02cd7b956
* minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94381
diff
changeset
|
5789 ;; it's not a "completion field", in which case we have to |
66b02cd7b956
* minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94381
diff
changeset
|
5790 ;; call choose-completion-delete-max-match even if base-size is set. |
66b02cd7b956
* minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94381
diff
changeset
|
5791 ;; - we may need to delete further than (point) to (field-end), |
66b02cd7b956
* minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94381
diff
changeset
|
5792 ;; depending on the completion-style, and for that we need to |
66b02cd7b956
* minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94381
diff
changeset
|
5793 ;; extra data `completion-extra-size'. |
45612 | 5794 (if base-size |
94464
66b02cd7b956
* minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94381
diff
changeset
|
5795 (delete-region (+ base-size (field-beginning)) (point)) |
45612 | 5796 (choose-completion-delete-max-match choice)) |
5797 (insert choice) | |
5798 (remove-text-properties (- (point) (length choice)) (point) | |
5799 '(mouse-face nil)) | |
5800 ;; Update point in the window that BUFFER is showing in. | |
5801 (let ((window (get-buffer-window buffer t))) | |
5802 (set-window-point window (point))) | |
5803 ;; If completing for the minibuffer, exit it with this choice. | |
5804 (and (not completion-no-auto-exit) | |
94464
66b02cd7b956
* minibuffer.el (completion-common-substring): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94381
diff
changeset
|
5805 (minibufferp buffer) |
45612 | 5806 minibuffer-completion-table |
5807 ;; If this is reading a file name, and the file name chosen | |
5808 ;; is a directory, don't exit the minibuffer. | |
94215
28a10b30dfc6
(choose-completion-string): Use minibuffer-completion-table.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94062
diff
changeset
|
5809 (if (and minibuffer-completing-file-name |
45612 | 5810 (file-directory-p (field-string (point-max)))) |
5811 (let ((mini (active-minibuffer-window))) | |
5812 (select-window mini) | |
5813 (when minibuffer-auto-raise | |
5814 (raise-frame (window-frame mini)))) | |
5815 (exit-minibuffer))))))) | |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
5816 |
94062
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5817 (define-derived-mode completion-list-mode nil "Completion List" |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
5818 "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
|
5819 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
|
5820 to select the completion near point. |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
5821 Use \\<completion-list-mode-map>\\[mouse-choose-completion] to select one\ |
91753
d4fe8debe315
Kevin Ryde <user42 at zip.com.au>
Glenn Morris <rgm@gnu.org>
parents:
91327
diff
changeset
|
5822 with the mouse. |
d4fe8debe315
Kevin Ryde <user42 at zip.com.au>
Glenn Morris <rgm@gnu.org>
parents:
91327
diff
changeset
|
5823 |
d4fe8debe315
Kevin Ryde <user42 at zip.com.au>
Glenn Morris <rgm@gnu.org>
parents:
91327
diff
changeset
|
5824 \\{completion-list-mode-map}" |
94062
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5825 (set (make-local-variable 'completion-base-size) nil)) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
5826 |
37300
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
5827 (defun completion-list-mode-finish () |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
5828 "Finish setup of the completions buffer. |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
5829 Called from `temp-buffer-show-hook'." |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
5830 (when (eq major-mode 'completion-list-mode) |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
5831 (toggle-read-only 1))) |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
5832 |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
5833 (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
|
5834 |
66114
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65862
diff
changeset
|
5835 |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65862
diff
changeset
|
5836 ;; Variables and faces used in `completion-setup-function'. |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65862
diff
changeset
|
5837 |
72645
abc1e4de6197
(completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents:
72638
diff
changeset
|
5838 (defcustom completion-show-help t |
abc1e4de6197
(completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents:
72638
diff
changeset
|
5839 "Non-nil means show help message in *Completions* buffer." |
abc1e4de6197
(completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents:
72638
diff
changeset
|
5840 :type 'boolean |
abc1e4de6197
(completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents:
72638
diff
changeset
|
5841 :version "22.1" |
abc1e4de6197
(completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents:
72638
diff
changeset
|
5842 :group 'completion) |
abc1e4de6197
(completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents:
72638
diff
changeset
|
5843 |
56613
05c3cf703d59
(completion-root-regexp): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56505
diff
changeset
|
5844 ;; This is for packages that need to bind it to a non-default regexp |
05c3cf703d59
(completion-root-regexp): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56505
diff
changeset
|
5845 ;; in order to make the first-differing character highlight work |
05c3cf703d59
(completion-root-regexp): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56505
diff
changeset
|
5846 ;; to their liking |
05c3cf703d59
(completion-root-regexp): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56505
diff
changeset
|
5847 (defvar completion-root-regexp "^/" |
05c3cf703d59
(completion-root-regexp): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56505
diff
changeset
|
5848 "Regexp to use in `completion-setup-function' to find the root directory.") |
05c3cf703d59
(completion-root-regexp): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56505
diff
changeset
|
5849 |
66114
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65862
diff
changeset
|
5850 ;; This function goes in completion-setup-hook, so that it is called |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65862
diff
changeset
|
5851 ;; after the text of the completion list buffer is written. |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
5852 (defun completion-setup-function () |
66595
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
5853 (let* ((mainbuf (current-buffer)) |
103201
0f518b180240
(completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103072
diff
changeset
|
5854 (base-dir |
0f518b180240
(completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103072
diff
changeset
|
5855 ;; When reading a file name in the minibuffer, |
0f518b180240
(completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103072
diff
changeset
|
5856 ;; try and find the right default-directory to set in the |
0f518b180240
(completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103072
diff
changeset
|
5857 ;; completion list buffer. |
0f518b180240
(completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103072
diff
changeset
|
5858 ;; FIXME: Why do we do that, actually? --Stef |
0f518b180240
(completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103072
diff
changeset
|
5859 (if minibuffer-completing-file-name |
0f518b180240
(completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103072
diff
changeset
|
5860 (file-name-as-directory |
0f518b180240
(completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103072
diff
changeset
|
5861 (expand-file-name |
0f518b180240
(completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103072
diff
changeset
|
5862 (substring (minibuffer-completion-contents) |
0f518b180240
(completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103072
diff
changeset
|
5863 0 (or completion-base-size 0))))))) |
55699
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
5864 (with-current-buffer standard-output |
94062
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5865 (let ((base-size completion-base-size)) ;Read before killing localvars. |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5866 (completion-list-mode) |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5867 (set (make-local-variable 'completion-base-size) base-size)) |
66595
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
5868 (set (make-local-variable 'completion-reference-buffer) mainbuf) |
103201
0f518b180240
(completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
103072
diff
changeset
|
5869 (if base-dir (setq default-directory base-dir)) |
94062
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5870 (unless completion-base-size |
100623
5a144164af93
(completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100430
diff
changeset
|
5871 ;; This shouldn't be needed any more, but further analysis is needed |
5a144164af93
(completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
100430
diff
changeset
|
5872 ;; to make sure it's the case. |
94062
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5873 (setq completion-base-size |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5874 (cond |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5875 (minibuffer-completing-file-name |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5876 ;; For file name completion, use the number of chars before |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5877 ;; the start of the file name component at point. |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5878 (with-current-buffer mainbuf |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5879 (save-excursion |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5880 (skip-chars-backward completion-root-regexp) |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5881 (- (point) (minibuffer-prompt-end))))) |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5882 (minibuffer-completing-symbol nil) |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5883 ;; Otherwise, in minibuffer, the base size is 0. |
9fefa536be58
* minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94013
diff
changeset
|
5884 ((minibufferp mainbuf) 0)))) |
72645
abc1e4de6197
(completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents:
72638
diff
changeset
|
5885 ;; Maybe insert help string. |
abc1e4de6197
(completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents:
72638
diff
changeset
|
5886 (when completion-show-help |
abc1e4de6197
(completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents:
72638
diff
changeset
|
5887 (goto-char (point-min)) |
abc1e4de6197
(completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents:
72638
diff
changeset
|
5888 (if (display-mouse-p) |
abc1e4de6197
(completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents:
72638
diff
changeset
|
5889 (insert (substitute-command-keys |
abc1e4de6197
(completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents:
72638
diff
changeset
|
5890 "Click \\[mouse-choose-completion] on a completion to select it.\n"))) |
abc1e4de6197
(completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents:
72638
diff
changeset
|
5891 (insert (substitute-command-keys |
abc1e4de6197
(completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents:
72638
diff
changeset
|
5892 "In this buffer, type \\[choose-completion] to \ |
abc1e4de6197
(completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents:
72638
diff
changeset
|
5893 select the completion near point.\n\n")))))) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
5894 |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
5895 (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
|
5896 |
66595
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
5897 (define-key minibuffer-local-completion-map [prior] 'switch-to-completions) |
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
5898 (define-key minibuffer-local-completion-map "\M-v" 'switch-to-completions) |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
5899 |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
5900 (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
|
5901 "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
|
5902 (interactive) |
12483
ec77cb3940f1
(switch-to-completions): Make a completions window if none.
Richard M. Stallman <rms@gnu.org>
parents:
12428
diff
changeset
|
5903 ;; 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
|
5904 (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
|
5905 (minibuffer-completion-help)) |
20663
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
5906 (let ((window (get-buffer-window "*Completions*"))) |
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
5907 (when window |
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
5908 (select-window window) |
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
5909 (goto-char (point-min)) |
76634
98c3595cace4
(compose-mail): Run switch-function after setting up the mail buffer.
Richard M. Stallman <rms@gnu.org>
parents:
76579
diff
changeset
|
5910 (search-forward "\n\n" nil t) |
20663
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
5911 (forward-line 1)))) |
68345
b10c2ebde562
(clone-buffer, clone-indirect-buffer, clone-indirect-buffer-other-window):
Juri Linkov <juri@jurta.org>
parents:
68280
diff
changeset
|
5912 |
b10c2ebde562
(clone-buffer, clone-indirect-buffer, clone-indirect-buffer-other-window):
Juri Linkov <juri@jurta.org>
parents:
68280
diff
changeset
|
5913 ;;; Support keyboard commands to turn on various modifiers. |
11140
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5914 |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5915 ;; 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
|
5916 ;; to the following event. |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5917 |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5918 (defun event-apply-alt-modifier (ignore-prompt) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
5919 "\\<function-key-map>Add the Alt modifier to the following event. |
22324
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
5920 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
|
5921 (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
|
5922 (defun event-apply-super-modifier (ignore-prompt) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
5923 "\\<function-key-map>Add the Super modifier to the following event. |
22324
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
5924 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
|
5925 (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
|
5926 (defun event-apply-hyper-modifier (ignore-prompt) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
5927 "\\<function-key-map>Add the Hyper modifier to the following event. |
22324
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
5928 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
|
5929 (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
|
5930 (defun event-apply-shift-modifier (ignore-prompt) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
5931 "\\<function-key-map>Add the Shift modifier to the following event. |
22324
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
5932 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
|
5933 (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
|
5934 (defun event-apply-control-modifier (ignore-prompt) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
5935 "\\<function-key-map>Add the Ctrl modifier to the following event. |
22324
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
5936 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
|
5937 (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
|
5938 (defun event-apply-meta-modifier (ignore-prompt) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
5939 "\\<function-key-map>Add the Meta modifier to the following event. |
22324
0c5b61cb97c0
(event-apply-alt-modifier, etc): Doc fixes.
Karl Heuer <kwzh@gnu.org>
parents:
22304
diff
changeset
|
5940 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
|
5941 (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
|
5942 |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5943 (defun event-apply-modifier (event symbol lshiftby prefix) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5944 "Apply a modifier flag to event EVENT. |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5945 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
|
5946 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
|
5947 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
|
5948 (if (numberp event) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5949 (cond ((eq symbol 'control) |
11201
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
5950 (if (and (<= (downcase event) ?z) |
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
5951 (>= (downcase event) ?a)) |
11140
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5952 (- (downcase event) ?a -1) |
11201
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
5953 (if (and (<= (downcase event) ?Z) |
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
5954 (>= (downcase event) ?A)) |
11140
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5955 (- (downcase event) ?A -1) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5956 (logior (lsh 1 lshiftby) event)))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5957 ((eq symbol 'shift) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5958 (if (and (<= (downcase event) ?z) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5959 (>= (downcase event) ?a)) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5960 (upcase event) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5961 (logior (lsh 1 lshiftby) event))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5962 (t |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5963 (logior (lsh 1 lshiftby) event))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5964 (if (memq symbol (event-modifiers event)) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5965 event |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5966 (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
|
5967 (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
|
5968 (if (symbolp event) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5969 event-type |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5970 (cons event-type (cdr event))))))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5971 |
11206
60b7ab7d4fec
Change bindings of event-apply-control-modifier,
Karl Heuer <kwzh@gnu.org>
parents:
11201
diff
changeset
|
5972 (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
|
5973 (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
|
5974 (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
|
5975 (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
|
5976 (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
|
5977 (define-key function-key-map [?\C-x ?@ ?c] 'event-apply-control-modifier) |
68345
b10c2ebde562
(clone-buffer, clone-indirect-buffer, clone-indirect-buffer-other-window):
Juri Linkov <juri@jurta.org>
parents:
68280
diff
changeset
|
5978 |
3947
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5979 ;;;; Keypad support. |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5980 |
81666
5b21f07d3106
Docstring convention fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81587
diff
changeset
|
5981 ;; Make the keypad keys act like ordinary typing keys. If people add |
5b21f07d3106
Docstring convention fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81587
diff
changeset
|
5982 ;; bindings for the function key symbols, then those bindings will |
5b21f07d3106
Docstring convention fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81587
diff
changeset
|
5983 ;; override these, so this shouldn't interfere with any existing |
5b21f07d3106
Docstring convention fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81587
diff
changeset
|
5984 ;; bindings. |
3947
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5985 |
5342
f38861038093
(setting up kp-... keys): Make ascii-character props.
Richard M. Stallman <rms@gnu.org>
parents:
5324
diff
changeset
|
5986 ;; 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
|
5987 (mapc |
3947
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5988 (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
|
5989 (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
|
5990 (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
|
5991 (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
|
5992 (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
|
5993 '((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
|
5994 (kp-5 ?5) (kp-6 ?6) (kp-7 ?7) (kp-8 ?8) (kp-9 ?9) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
5995 (kp-space ?\s) |
3947
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5996 (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
|
5997 (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
|
5998 (kp-multiply ?*) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5999 (kp-add ?+) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
6000 (kp-separator ?,) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
6001 (kp-subtract ?-) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
6002 (kp-decimal ?.) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
6003 (kp-divide ?/) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
6004 (kp-equal ?=))) |
44906
fe8ce22fc4a1
(next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents:
44756
diff
changeset
|
6005 |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
6006 ;;;; |
26003
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6007 ;;;; forking a twin copy of a buffer. |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
6008 ;;;; |
26003
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6009 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6010 (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
|
6011 "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
|
6012 |
91788
14206a515e37
(clone-indirect-buffer-hook): New hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91753
diff
changeset
|
6013 (defvar clone-indirect-buffer-hook nil |
14206a515e37
(clone-indirect-buffer-hook): New hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91753
diff
changeset
|
6014 "Normal hook to run in the new buffer at the end of `clone-indirect-buffer'.") |
14206a515e37
(clone-indirect-buffer-hook): New hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91753
diff
changeset
|
6015 |
26003
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6016 (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
|
6017 "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
|
6018 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
|
6019 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
|
6020 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
|
6021 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
|
6022 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
|
6023 (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
|
6024 (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
|
6025 (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
|
6026 (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
|
6027 (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
|
6028 (new-process |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6029 (if (memq (process-status process) '(open)) |
43969 | 6030 (let ((args (process-contact process t))) |
6031 (setq args (plist-put args :name newname)) | |
6032 (setq args (plist-put args :buffer | |
49227
b03a9c537356
(clone-process): Copy process' plist to new process.
Kim F. Storm <storm@cua.dk>
parents:
49103
diff
changeset
|
6033 (if (process-buffer process) |
b03a9c537356
(clone-process): Copy process' plist to new process.
Kim F. Storm <storm@cua.dk>
parents:
49103
diff
changeset
|
6034 (current-buffer)))) |
43969 | 6035 (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
|
6036 (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
|
6037 (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
|
6038 (process-command process))))) |
43969 | 6039 (set-process-query-on-exit-flag |
6040 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
|
6041 (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
|
6042 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
|
6043 (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
|
6044 (set-process-sentinel new-process (process-sentinel process)) |
49227
b03a9c537356
(clone-process): Copy process' plist to new process.
Kim F. Storm <storm@cua.dk>
parents:
49103
diff
changeset
|
6045 (set-process-plist new-process (copy-sequence (process-plist process))) |
26003
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6046 new-process))) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6047 |
44152 | 6048 ;; 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
|
6049 ;; - syntax-table |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6050 ;; - overlays |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6051 (defun clone-buffer (&optional newname display-flag) |
54418
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
6052 "Create and return a twin copy of the current buffer. |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
6053 Unlike an indirect buffer, the new buffer can be edited |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
6054 independently of the old one (if it is not read-only). |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
6055 NEWNAME is the name of the new buffer. It may be modified by |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
6056 adding or incrementing <N> at the end as necessary to create a |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
6057 unique buffer name. If nil, it defaults to the name of the |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
6058 current buffer, with the proper suffix. If DISPLAY-FLAG is |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
6059 non-nil, the new buffer is shown with `pop-to-buffer'. Trying to |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
6060 clone a file-visiting buffer, or a buffer whose major mode symbol |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
6061 has a non-nil `no-clone' property, results in an error. |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
6062 |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
6063 Interactively, DISPLAY-FLAG is t and NEWNAME is the name of the |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
6064 current buffer with appropriate suffix. However, if a prefix |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
6065 argument is given, then the command prompts for NEWNAME in the |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
6066 minibuffer. |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
6067 |
26003
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6068 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
|
6069 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
|
6070 (interactive |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
6071 (progn |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
6072 (if buffer-file-name |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
6073 (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
|
6074 (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
|
6075 (error "Cannot clone a buffer in %s mode" mode-name)) |
68345
b10c2ebde562
(clone-buffer, clone-indirect-buffer, clone-indirect-buffer-other-window):
Juri Linkov <juri@jurta.org>
parents:
68280
diff
changeset
|
6076 (list (if current-prefix-arg |
b10c2ebde562
(clone-buffer, clone-indirect-buffer, clone-indirect-buffer-other-window):
Juri Linkov <juri@jurta.org>
parents:
68280
diff
changeset
|
6077 (read-buffer "Name of new cloned buffer: " (current-buffer))) |
40966
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
6078 t))) |
26003
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6079 (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
|
6080 (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
|
6081 (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
|
6082 (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
|
6083 (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
|
6084 (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
|
6085 (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
|
6086 (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
|
6087 (ptmin (point-min)) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6088 (ptmax (point-max)) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6089 (pt (point)) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6090 (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
|
6091 (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
|
6092 (mode major-mode) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6093 (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
|
6094 (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
|
6095 (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
|
6096 (save-restriction |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6097 (widen) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6098 (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
|
6099 (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
|
6100 (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
|
6101 (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
|
6102 (goto-char pt) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6103 (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
|
6104 (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
|
6105 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6106 ;; 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
|
6107 (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
|
6108 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6109 ;; 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
|
6110 (funcall mode) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6111 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6112 ;; Set up other local variables. |
84878
c73290ec60ed
(clone-buffer): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
84812
diff
changeset
|
6113 (mapc (lambda (v) |
c73290ec60ed
(clone-buffer): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
84812
diff
changeset
|
6114 (condition-case () ;in case var is read-only |
c73290ec60ed
(clone-buffer): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
84812
diff
changeset
|
6115 (if (symbolp v) |
c73290ec60ed
(clone-buffer): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
84812
diff
changeset
|
6116 (makunbound v) |
c73290ec60ed
(clone-buffer): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
84812
diff
changeset
|
6117 (set (make-local-variable (car v)) (cdr v))) |
c73290ec60ed
(clone-buffer): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
84812
diff
changeset
|
6118 (error nil))) |
c73290ec60ed
(clone-buffer): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
84812
diff
changeset
|
6119 lvars) |
26003
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6120 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6121 ;; 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
|
6122 ;; 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
|
6123 (run-hooks 'clone-buffer-hook)) |
68352
de7cc6d3013b
(clone-buffer): Don't show the new buffer in the same window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68345
diff
changeset
|
6124 (if display-flag |
de7cc6d3013b
(clone-buffer): Don't show the new buffer in the same window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68345
diff
changeset
|
6125 ;; Presumably the current buffer is shown in the selected frame, so |
de7cc6d3013b
(clone-buffer): Don't show the new buffer in the same window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68345
diff
changeset
|
6126 ;; we want to display the clone elsewhere. |
de7cc6d3013b
(clone-buffer): Don't show the new buffer in the same window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68345
diff
changeset
|
6127 (let ((same-window-regexps nil) |
de7cc6d3013b
(clone-buffer): Don't show the new buffer in the same window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68345
diff
changeset
|
6128 (same-window-buffer-names)) |
de7cc6d3013b
(clone-buffer): Don't show the new buffer in the same window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68345
diff
changeset
|
6129 (pop-to-buffer new))) |
26003
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6130 new)) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
6131 |
28624
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
6132 |
28659
17281c5a2834
(clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents:
28624
diff
changeset
|
6133 (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
|
6134 "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
|
6135 |
63592
153f4469d91a
(next-error-buffer-p, next-error-find-buffer): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
63487
diff
changeset
|
6136 Give the indirect buffer name NEWNAME. Interactively, read NEWNAME |
28624
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
6137 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
|
6138 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
|
6139 buffer's name. The name is modified by adding a `<N>' suffix to it |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
6140 or by incrementing the N in an existing suffix. Trying to clone a |
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
6141 buffer whose major mode symbol has a non-nil `no-clone-indirect' |
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
6142 property results in an error. |
28624
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
6143 |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
6144 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
|
6145 This is always done when called interactively. |
17281c5a2834
(clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents:
28624
diff
changeset
|
6146 |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
6147 Optional third arg NORECORD non-nil means do not put this buffer at the |
28659
17281c5a2834
(clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents:
28624
diff
changeset
|
6148 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
|
6149 (interactive |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
6150 (progn |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
6151 (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
|
6152 (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
|
6153 (list (if current-prefix-arg |
68345
b10c2ebde562
(clone-buffer, clone-indirect-buffer, clone-indirect-buffer-other-window):
Juri Linkov <juri@jurta.org>
parents:
68280
diff
changeset
|
6154 (read-buffer "Name of indirect buffer: " (current-buffer))) |
40966
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
6155 t))) |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
6156 (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
|
6157 (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
|
6158 (setq newname (or newname (buffer-name))) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
6159 (if (string-match "<[0-9]+>\\'" newname) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
6160 (setq newname (substring newname 0 (match-beginning 0)))) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
6161 (let* ((name (generate-new-buffer-name newname)) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
6162 (buffer (make-indirect-buffer (current-buffer) name t))) |
91788
14206a515e37
(clone-indirect-buffer-hook): New hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91753
diff
changeset
|
6163 (with-current-buffer buffer |
14206a515e37
(clone-indirect-buffer-hook): New hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
91753
diff
changeset
|
6164 (run-hooks 'clone-indirect-buffer-hook)) |
28624
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
6165 (when display-flag |
33781
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
6166 (pop-to-buffer buffer norecord)) |
28624
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
6167 buffer)) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
6168 |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
6169 |
68403
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
6170 (defun clone-indirect-buffer-other-window (newname display-flag &optional norecord) |
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
6171 "Like `clone-indirect-buffer' but display in another window." |
68280
c1db05754431
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68042
diff
changeset
|
6172 (interactive |
c1db05754431
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68042
diff
changeset
|
6173 (progn |
c1db05754431
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68042
diff
changeset
|
6174 (if (get major-mode 'no-clone-indirect) |
c1db05754431
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68042
diff
changeset
|
6175 (error "Cannot indirectly clone a buffer in %s mode" mode-name)) |
c1db05754431
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68042
diff
changeset
|
6176 (list (if current-prefix-arg |
68345
b10c2ebde562
(clone-buffer, clone-indirect-buffer, clone-indirect-buffer-other-window):
Juri Linkov <juri@jurta.org>
parents:
68280
diff
changeset
|
6177 (read-buffer "Name of indirect buffer: " (current-buffer))) |
68280
c1db05754431
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68042
diff
changeset
|
6178 t))) |
45064
6e3c5d67f0fe
(clone-indirect-buffer-other-window): Fix a typo in `pop-up-window'.
Eli Zaretskii <eliz@gnu.org>
parents:
44981
diff
changeset
|
6179 (let ((pop-up-windows t)) |
68403
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
6180 (clone-indirect-buffer newname display-flag norecord))) |
28659
17281c5a2834
(clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents:
28624
diff
changeset
|
6181 |
44906
fe8ce22fc4a1
(next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents:
44756
diff
changeset
|
6182 |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
6183 ;;; Handling of Backspace and Delete keys. |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
6184 |
83387
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6185 (defcustom normal-erase-is-backspace 'maybe |
86104
108c751714f7
(normal-erase-is-backspace): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85997
diff
changeset
|
6186 "Set the default behavior of the Delete and Backspace keys. |
83387
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6187 |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6188 If set to t, Delete key deletes forward and Backspace key deletes |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6189 backward. |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6190 |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6191 If set to nil, both Delete and Backspace keys delete backward. |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6192 |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6193 If set to 'maybe (which is the default), Emacs automatically |
86104
108c751714f7
(normal-erase-is-backspace): Fix typos in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
85997
diff
changeset
|
6194 selects a behavior. On window systems, the behavior depends on |
83387
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6195 the keyboard used. If the keyboard has both a Backspace key and |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6196 a Delete key, and both are mapped to their usual meanings, the |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6197 option's default value is set to t, so that Backspace can be used |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6198 to delete backward, and Delete can be used to delete forward. |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6199 |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6200 If not running under a window system, customizing this option |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6201 accomplishes a similar effect by mapping C-h, which is usually |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6202 generated by the Backspace key, to DEL, and by mapping DEL to C-d |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6203 via `keyboard-translate'. The former functionality of C-h is |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6204 available on the F1 key. You should probably not use this |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6205 setting if you don't have both Backspace, Delete and F1 keys. |
34827
0f079e057295
(delete-key-deletes-forward): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
34713
diff
changeset
|
6206 |
0f079e057295
(delete-key-deletes-forward): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
34713
diff
changeset
|
6207 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
|
6208 call `normal-erase-is-backspace-mode' (which see) instead." |
83387
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6209 :type '(choice (const :tag "Off" nil) |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6210 (const :tag "Maybe" maybe) |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6211 (other :tag "On" t)) |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
6212 :group 'editing-basics |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
6213 :version "21.1" |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
6214 :set (lambda (symbol value) |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
6215 ;; 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
|
6216 ;; dumping Emacs. It doesn't really matter. |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
6217 (if (fboundp 'normal-erase-is-backspace-mode) |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
6218 (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
|
6219 (set-default symbol value)))) |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
6220 |
83387
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6221 (defun normal-erase-is-backspace-setup-frame (&optional frame) |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6222 "Set up `normal-erase-is-backspace-mode' on FRAME, if necessary." |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6223 (unless frame (setq frame (selected-frame))) |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6224 (with-selected-frame frame |
83420
521d3f18b3d1
Reimplement terminal parameters in C; clean up term.c, create terminal.c.
Karoly Lorentey <lorentey@elte.hu>
parents:
83415
diff
changeset
|
6225 (unless (terminal-parameter nil 'normal-erase-is-backspace) |
84381
38640f40d45e
(normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83716
diff
changeset
|
6226 (normal-erase-is-backspace-mode |
38640f40d45e
(normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83716
diff
changeset
|
6227 (if (if (eq normal-erase-is-backspace 'maybe) |
38640f40d45e
(normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83716
diff
changeset
|
6228 (and (not noninteractive) |
38640f40d45e
(normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83716
diff
changeset
|
6229 (or (memq system-type '(ms-dos windows-nt)) |
38640f40d45e
(normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83716
diff
changeset
|
6230 (and (memq window-system '(x)) |
38640f40d45e
(normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83716
diff
changeset
|
6231 (fboundp 'x-backspace-delete-keys-p) |
38640f40d45e
(normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83716
diff
changeset
|
6232 (x-backspace-delete-keys-p)) |
38640f40d45e
(normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83716
diff
changeset
|
6233 ;; If the terminal Emacs is running on has erase char |
38640f40d45e
(normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83716
diff
changeset
|
6234 ;; set to ^H, use the Backspace key for deleting |
38640f40d45e
(normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83716
diff
changeset
|
6235 ;; backward, and the Delete key for deleting forward. |
38640f40d45e
(normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83716
diff
changeset
|
6236 (and (null window-system) |
38640f40d45e
(normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83716
diff
changeset
|
6237 (eq tty-erase-char ?\^H)))) |
38640f40d45e
(normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83716
diff
changeset
|
6238 normal-erase-is-backspace) |
38640f40d45e
(normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83716
diff
changeset
|
6239 1 0))))) |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
6240 |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
6241 (defun normal-erase-is-backspace-mode (&optional arg) |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
6242 "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
|
6243 |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
6244 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
|
6245 |
83387
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6246 On window systems, when this mode is on, Delete is mapped to C-d |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6247 and Backspace is mapped to DEL; when this mode is off, both |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6248 Delete and Backspace are mapped to DEL. (The remapping goes via |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6249 `local-function-key-map', so binding Delete or Backspace in the |
0181341f0aca
Fix Delete key on X by adapting normal-erase-is-backspace-mode for multi-tty. (Reported by Dan Waber and Dan Nicolaescu.)
Karoly Lorentey <lorentey@elte.hu>
parents:
83386
diff
changeset
|
6250 global or local keymap will override that.) |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
6251 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
6252 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
|
6253 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
|
6254 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
|
6255 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
|
6256 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
|
6257 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
|
6258 `backward-kill-word'. |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
6259 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
6260 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
|
6261 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
|
6262 `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
|
6263 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
|
6264 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
6265 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
|
6266 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
|
6267 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
|
6268 have both Backspace, Delete and F1 keys. |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
6269 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
6270 See also `normal-erase-is-backspace'." |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
6271 (interactive "P") |
83448
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6272 (let ((enabled (or (and arg (> (prefix-numeric-value arg) 0)) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6273 (and (not arg) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6274 (not (eq 1 (terminal-parameter |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6275 nil 'normal-erase-is-backspace))))))) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6276 (set-terminal-parameter nil 'normal-erase-is-backspace |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6277 (if enabled 1 0)) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6278 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96874
diff
changeset
|
6279 (cond ((or (memq window-system '(x w32 ns pc)) |
83448
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6280 (memq system-type '(ms-dos windows-nt))) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6281 (let* ((bindings |
101577
50a9b1249468
the latter is not available on ttys anyway.
Chong Yidong <cyd@stupidchicken.com>
parents:
101181
diff
changeset
|
6282 `(([M-delete] [M-backspace]) |
83448
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6283 ([C-M-delete] [C-M-backspace]) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6284 (,esc-map |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6285 [C-delete] [C-backspace]))) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6286 (old-state (lookup-key local-function-key-map [delete]))) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6287 |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6288 (if enabled |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6289 (progn |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6290 (define-key local-function-key-map [delete] [?\C-d]) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6291 (define-key local-function-key-map [kp-delete] [?\C-d]) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6292 (define-key local-function-key-map [backspace] [?\C-?])) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6293 (define-key local-function-key-map [delete] [?\C-?]) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6294 (define-key local-function-key-map [kp-delete] [?\C-?]) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6295 (define-key local-function-key-map [backspace] [?\C-?])) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6296 |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6297 ;; Maybe swap bindings of C-delete and C-backspace, etc. |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6298 (unless (equal old-state (lookup-key local-function-key-map [delete])) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6299 (dolist (binding bindings) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6300 (let ((map global-map)) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6301 (when (keymapp (car binding)) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6302 (setq map (car binding) binding (cdr binding))) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6303 (let* ((key1 (nth 0 binding)) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6304 (key2 (nth 1 binding)) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6305 (binding1 (lookup-key map key1)) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6306 (binding2 (lookup-key map key2))) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6307 (define-key map key1 binding2) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6308 (define-key map key2 binding1))))))) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6309 (t |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6310 (if enabled |
35346
382fba2f10a6
(delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents:
35333
diff
changeset
|
6311 (progn |
83448
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6312 (keyboard-translate ?\C-h ?\C-?) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6313 (keyboard-translate ?\C-? ?\C-d)) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6314 (keyboard-translate ?\C-h ?\C-h) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6315 (keyboard-translate ?\C-? ?\C-?)))) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6316 |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6317 (run-hooks 'normal-erase-is-backspace-hook) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6318 (if (interactive-p) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6319 (message "Delete key deletes %s" |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6320 (if (terminal-parameter nil 'normal-erase-is-backspace) |
d2af586aefe4
Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents:
83429
diff
changeset
|
6321 "forward" "backward"))))) |
51220
c7730f2ad484
(idle-update-delay): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents:
51219
diff
changeset
|
6322 |
51606
bee14d8ec0a6
(kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51597
diff
changeset
|
6323 (defvar vis-mode-saved-buffer-invisibility-spec nil |
51802
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
6324 "Saved value of `buffer-invisibility-spec' when Visible mode is on.") |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
6325 |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
6326 (define-minor-mode visible-mode |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
6327 "Toggle Visible mode. |
78492
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
6328 With argument ARG turn Visible mode on if ARG is positive, otherwise |
7c8949dbfa0d
Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents:
78236
diff
changeset
|
6329 turn it off. |
51802
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
6330 |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
6331 Enabling Visible mode makes all invisible text temporarily visible. |
99257
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
6332 Disabling Visible mode turns off that effect. Visible mode works by |
1fbe0f0007b7
* simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents:
99008
diff
changeset
|
6333 saving the value of `buffer-invisibility-spec' and setting it to nil." |
51597
9b14210f4740
(vis-mode): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51461
diff
changeset
|
6334 :lighter " Vis" |
61232
728460f45e1e
(visible-mode): Use explicit :group keyword. This changes the group
Luc Teirlinck <teirllm@auburn.edu>
parents:
61121
diff
changeset
|
6335 :group 'editing-basics |
51606
bee14d8ec0a6
(kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51597
diff
changeset
|
6336 (when (local-variable-p 'vis-mode-saved-buffer-invisibility-spec) |
bee14d8ec0a6
(kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51597
diff
changeset
|
6337 (setq buffer-invisibility-spec vis-mode-saved-buffer-invisibility-spec) |
bee14d8ec0a6
(kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51597
diff
changeset
|
6338 (kill-local-variable 'vis-mode-saved-buffer-invisibility-spec)) |
51802
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
6339 (when visible-mode |
51606
bee14d8ec0a6
(kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51597
diff
changeset
|
6340 (set (make-local-variable 'vis-mode-saved-buffer-invisibility-spec) |
bee14d8ec0a6
(kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51597
diff
changeset
|
6341 buffer-invisibility-spec) |
bee14d8ec0a6
(kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51597
diff
changeset
|
6342 (setq buffer-invisibility-spec nil))) |
51597
9b14210f4740
(vis-mode): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51461
diff
changeset
|
6343 |
98949
46d6efaefafc
(apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents:
98892
diff
changeset
|
6344 ;; Partial application of functions (similar to "currying"). |
46d6efaefafc
(apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents:
98892
diff
changeset
|
6345 (defun apply-partially (fun &rest args) |
46d6efaefafc
(apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents:
98892
diff
changeset
|
6346 "Return a function that is a partial application of FUN to ARGS. |
46d6efaefafc
(apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents:
98892
diff
changeset
|
6347 ARGS is a list of the first N arguments to pass to FUN. |
46d6efaefafc
(apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents:
98892
diff
changeset
|
6348 The result is a new function which does the same as FUN, except that |
46d6efaefafc
(apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents:
98892
diff
changeset
|
6349 the first N arguments are fixed at the values with which this function |
46d6efaefafc
(apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents:
98892
diff
changeset
|
6350 was called." |
46d6efaefafc
(apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents:
98892
diff
changeset
|
6351 (lexical-let ((fun fun) (args1 args)) |
46d6efaefafc
(apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents:
98892
diff
changeset
|
6352 (lambda (&rest args2) (apply fun (append args1 args2))))) |
46d6efaefafc
(apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents:
98892
diff
changeset
|
6353 |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
6354 ;; Minibuffer prompt stuff. |
39271
d56dcab29cce
(minibuffer-prompt-modification)
Gerd Moellmann <gerd@gnu.org>
parents:
39157
diff
changeset
|
6355 |
39289
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
6356 ;(defun minibuffer-prompt-modification (start end) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
6357 ; (error "You cannot modify the prompt")) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
6358 ; |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
6359 ; |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
6360 ;(defun minibuffer-prompt-insertion (start end) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
6361 ; (let ((inhibit-modification-hooks t)) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
6362 ; (delete-region start end) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
6363 ; ;; 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
|
6364 ; ;; and for the text deletion.above. |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
6365 ; (when (consp buffer-undo-list) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
6366 ; (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
|
6367 ; (message "You cannot modify the prompt"))) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
6368 ; |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
6369 ; |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49585
diff
changeset
|
6370 ;(setq minibuffer-prompt-properties |
39289
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
6371 ; (list 'modification-hooks '(minibuffer-prompt-modification) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
6372 ; 'insert-in-front-hooks '(minibuffer-prompt-insertion))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49585
diff
changeset
|
6373 ; |
39271
d56dcab29cce
(minibuffer-prompt-modification)
Gerd Moellmann <gerd@gnu.org>
parents:
39157
diff
changeset
|
6374 |
78548
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6375 |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6376 ;;;; Problematic external packages. |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6377 |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6378 ;; rms says this should be done by specifying symbols that define |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6379 ;; versions together with bad values. This is therefore not as |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6380 ;; flexible as it could be. See the thread: |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6381 ;; http://lists.gnu.org/archive/html/emacs-devel/2007-08/msg00300.html |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6382 (defconst bad-packages-alist |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6383 ;; Not sure exactly which semantic versions have problems. |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6384 ;; Definitely 2.0pre3, probably all 2.0pre's before this. |
79325
2888fe033e01
Ulrich Mueller <ulm at gentoo.org> (tiny change)
Glenn Morris <rgm@gnu.org>
parents:
79316
diff
changeset
|
6385 '((semantic semantic-version "\\`2\\.0pre[1-3]\\'" |
78548
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6386 "The version of `semantic' loaded does not work in Emacs 22. |
78999
d7d95ec4c3f0
(bad-packages-alist): Clarify Semantic and CEDET version numbers.
Glenn Morris <rgm@gnu.org>
parents:
78795
diff
changeset
|
6387 It can cause constant high CPU load. |
d7d95ec4c3f0
(bad-packages-alist): Clarify Semantic and CEDET version numbers.
Glenn Morris <rgm@gnu.org>
parents:
78795
diff
changeset
|
6388 Upgrade to at least Semantic 2.0pre4 (distributed with CEDET 1.0pre4).") |
78548
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6389 ;; CUA-mode does not work with GNU Emacs version 22.1 and newer. |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6390 ;; Except for version 1.2, all of the 1.x and 2.x version of cua-mode |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6391 ;; provided the `CUA-mode' feature. Since this is no longer true, |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6392 ;; we can warn the user if the `CUA-mode' feature is ever provided. |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6393 (CUA-mode t nil |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6394 "CUA-mode is now part of the standard GNU Emacs distribution, |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6395 so you can now enable CUA via the Options menu or by customizing `cua-mode'. |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6396 |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6397 You have loaded an older version of CUA-mode which does not work |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6398 correctly with this version of Emacs. You should remove the old |
79316
660c02754a71
(bad-packages-alist): Revert previous change.
Glenn Morris <rgm@gnu.org>
parents:
79310
diff
changeset
|
6399 version and use the one distributed with Emacs.")) |
78548
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6400 "Alist of packages known to cause problems in this version of Emacs. |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6401 Each element has the form (PACKAGE SYMBOL REGEXP STRING). |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6402 PACKAGE is either a regular expression to match file names, or a |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6403 symbol (a feature name); see the documentation of |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6404 `after-load-alist', to which this variable adds functions. |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6405 SYMBOL is either the name of a string variable, or `t'. Upon |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6406 loading PACKAGE, if SYMBOL is t or matches REGEXP, display a |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6407 warning using STRING as the message.") |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6408 |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6409 (defun bad-package-check (package) |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6410 "Run a check using the element from `bad-packages-alist' matching PACKAGE." |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6411 (condition-case nil |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6412 (let* ((list (assoc package bad-packages-alist)) |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6413 (symbol (nth 1 list))) |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6414 (and list |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6415 (boundp symbol) |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6416 (or (eq symbol t) |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6417 (and (stringp (setq symbol (eval symbol))) |
100430
2962a5a4e423
* simple.el (bad-package-check): Fix arguments of `display-warning',
Juanma Barranquero <lekktu@gmail.com>
parents:
99993
diff
changeset
|
6418 (string-match-p (nth 2 list) symbol))) |
2962a5a4e423
* simple.el (bad-package-check): Fix arguments of `display-warning',
Juanma Barranquero <lekktu@gmail.com>
parents:
99993
diff
changeset
|
6419 (display-warning package (nth 3 list) :warning))) |
78548
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6420 (error nil))) |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6421 |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6422 (mapc (lambda (elem) |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6423 (eval-after-load (car elem) `(bad-package-check ',(car elem)))) |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6424 bad-packages-alist) |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6425 |
3938d27d7af0
(bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents:
78492
diff
changeset
|
6426 |
47462
1bbef0cbbf67
Provide `simple'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47408
diff
changeset
|
6427 (provide 'simple) |
52401 | 6428 |
55699
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
6429 ;; arch-tag: 24af67c0-2a49-44f6-b3b1-312d8b570dfd |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
6430 ;;; simple.el ends here |