annotate lisp/simple.el @ 110214:b6a0e73c6b46

nnimap.el (nnimap-request-list): Servers may return \NoSelect case-insensitively.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 05 Sep 2010 23:56:42 +0000
parents c32f6ba217a2
children 39d3e1ba1931
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
1 ;;; simple.el --- basic editing commands for Emacs
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2
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,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 106553
diff changeset
4 ;; 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
79094
a28250ba40a4 Re-fill copyright header.
Glenn Morris <rgm@gnu.org>
parents: 78999
diff changeset
5 ;; Free Software Foundation, Inc.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
45078
829beb9a6a4b Follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 45064
diff changeset
7 ;; Maintainer: FSF
829beb9a6a4b Follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 45064
diff changeset
8 ;; Keywords: internal
110015
280c8ae2476d Add "Package:" file headers to denote built-in packages.
Chong Yidong <cyd@stupidchicken.com>
parents: 109957
diff changeset
9 ;; Package: emacs
45078
829beb9a6a4b Follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 45064
diff changeset
10
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11 ;; This file is part of GNU Emacs.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94464
diff changeset
13 ;; GNU Emacs is free software: you can redistribute it and/or modify
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 ;; 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
15 ;; 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
16 ;; (at your option) any later version.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 ;; GNU Emacs is distributed in the hope that it will be useful,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21 ;; GNU General Public License for more details.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
22
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
23 ;; 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
24 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
25
2315
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
26 ;;; Commentary:
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
27
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
28 ;; A grab-bag of basic Emacs commands not specifically related to some
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
29 ;; major mode or to file-handling.
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
30
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
31 ;;; Code:
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
32
98949
46d6efaefafc (apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents: 98892
diff changeset
33 ;; 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
34 (eval-when-compile (require 'cl))
46d6efaefafc (apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents: 98892
diff changeset
35
92948
73a01bf5cb80 * faces.el (xw-defined-colors):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92715
diff changeset
36 (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
37 (declare-function shell-mode "shell" ())
26466
b32572666174 (with-syntax-table): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26457
diff changeset
38
65295
0a6b52c97d53 (compilation-current-error): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 65173
diff changeset
39 (defvar compilation-current-error)
0a6b52c97d53 (compilation-current-error): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents: 65173
diff changeset
40
61111
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
41 (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
42 "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
43 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
44 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
45 :type 'number
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
46 :group 'display
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
47 :version "22.1")
26466
b32572666174 (with-syntax-table): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26457
diff changeset
48
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
49 (defgroup killing nil
56005
54d79ab53dd3 (eval-expression-print-format): Don't print additional
Juri Linkov <juri@jurta.org>
parents: 55975
diff changeset
50 "Killing and yanking commands."
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
51 :group 'editing)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
52
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
53 (defgroup paren-matching nil
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
54 "Highlight (un)matching of parens and expressions."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
55 :group 'matching)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
56
67777
8eda669e2619 (get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents: 67621
diff changeset
57 (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
58 "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
59 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
60 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
61
3fbbf35e6d87 2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents: 67446
diff changeset
62 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
63 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
64 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
65 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
66 ;; 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
67 (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
68 (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
69 found buf)
3fbbf35e6d87 2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents: 67446
diff changeset
70 (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
71 (setq buf (car list))
3fbbf35e6d87 2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents: 67446
diff changeset
72 (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
73 (buffer-live-p buf)
3fbbf35e6d87 2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents: 67446
diff changeset
74 (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
75 (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
76 (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
77 (setq found buf)
3fbbf35e6d87 2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents: 67446
diff changeset
78 (setq list (cdr list))))
3fbbf35e6d87 2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents: 67446
diff changeset
79 (car list)))
3fbbf35e6d87 2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents: 67446
diff changeset
80
67777
8eda669e2619 (get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents: 67621
diff changeset
81 (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
82 "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
83 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
84 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
85 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
86 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
87 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
88 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
89 it if necessary."
67602
3fbbf35e6d87 2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents: 67446
diff changeset
90 (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
91 (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
92 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
93 (get-buffer "*scratch*")
0186716f4b63 (last-buffer): Don't set major mode of *scratch* if
Martin Rudalics <rudalics@gmx.at>
parents: 100623
diff changeset
94 (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
95 (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
96 scratch)))
0186716f4b63 (last-buffer): Don't set major mode of *scratch* if
Martin Rudalics <rudalics@gmx.at>
parents: 100623
diff changeset
97
44906
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
98 (defun next-buffer ()
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
99 "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
100 (interactive)
83415
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83414
diff changeset
101 (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
102 (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
103 (bury-buffer buffer)))
67602
3fbbf35e6d87 2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents: 67446
diff changeset
104
3fbbf35e6d87 2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents: 67446
diff changeset
105 (defun previous-buffer ()
44906
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
106 "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
107 (interactive)
83415
d2c799f58129 Implement full support for frame-local `next-buffer' and `previous-buffer'.
Karoly Lorentey <lorentey@elte.hu>
parents: 83414
diff changeset
108 (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
109
56863
c8bb5aca0581 * simple.el (next-error): New defgroup and defface.
Juri Linkov <juri@jurta.org>
parents: 56862
diff changeset
110
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
111 ;;; next-error support framework
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
112
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
113 (defgroup next-error nil
64548
cff17c5abe4d (clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64289
diff changeset
114 "`next-error' support framework."
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
115 :group 'compilation
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59790
diff changeset
116 :version "22.1")
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
117
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
118 (defface next-error
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
119 '((t (:inherit region)))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
120 "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
121 :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
122 :version "22.1")
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
123
73101
b584d304b053 (next-error-highlight, next-error-highlight-no-select): Default to 0.5.
Richard M. Stallman <rms@gnu.org>
parents: 73014
diff changeset
124 (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
125 "Highlighting of locations in selected source buffers.
76785
bb2e03ff11bc (next-error-highlight): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 76634
diff changeset
126 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
127 in seconds, or until the next command is executed.
bb2e03ff11bc (next-error-highlight): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 76634
diff changeset
128 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
129 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
130 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
131 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
132 :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
133 (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
134 (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
135 (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
136 :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
137 :version "22.1")
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
138
73101
b584d304b053 (next-error-highlight, next-error-highlight-no-select): Default to 0.5.
Richard M. Stallman <rms@gnu.org>
parents: 73014
diff changeset
139 (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
140 "Highlighting of locations in `next-error-no-select'.
64548
cff17c5abe4d (clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64289
diff changeset
141 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
142 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
143 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
144 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
145 :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
146 (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
147 (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
148 (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
149 :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
150 :version "22.1")
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
151
81551
a39eb4ca5597 (next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 77750
diff changeset
152 (defcustom next-error-recenter nil
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
153 "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
154 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
155 :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
156 (const :tag "Center of window" (4))
81551
a39eb4ca5597 (next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 77750
diff changeset
157 (const :tag "No recentering" nil))
a39eb4ca5597 (next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 77750
diff changeset
158 :group 'next-error
a39eb4ca5597 (next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 77750
diff changeset
159 :version "23.1")
a39eb4ca5597 (next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 77750
diff changeset
160
64195
c8096b015bf1 (next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
161 (defcustom next-error-hook nil
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
162 "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
163 :type 'hook
c8096b015bf1 (next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
164 :group 'next-error)
c8096b015bf1 (next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
165
61070
ed6d9a5fc534 (next-error-highlight-timer): New variable.
Juri Linkov <juri@jurta.org>
parents: 60744
diff changeset
166 (defvar next-error-highlight-timer nil)
ed6d9a5fc534 (next-error-highlight-timer): New variable.
Juri Linkov <juri@jurta.org>
parents: 60744
diff changeset
167
61361
d5052fc4ea58 (next-error-overlay-arrow-position): New defvar.
Juri Linkov <juri@jurta.org>
parents: 61276
diff changeset
168 (defvar next-error-overlay-arrow-position nil)
105939
a0f778f4a995 * term/x-win.el (x-gtk-stock-map):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105938
diff changeset
169 (put 'next-error-overlay-arrow-position 'overlay-arrow-string (purecopy "=>"))
61361
d5052fc4ea58 (next-error-overlay-arrow-position): New defvar.
Juri Linkov <juri@jurta.org>
parents: 61276
diff changeset
170 (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
171
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
172 (defvar next-error-last-buffer nil
64548
cff17c5abe4d (clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64289
diff changeset
173 "The most recent `next-error' buffer.
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
174 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
175 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
176 or \\[compile-goto-error].")
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
177
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
178 (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
179 "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
180 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
181 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
182 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
183 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
184 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
185 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
186 to navigate in it.")
55066
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
104246
81a43a652b4b (next-error-move-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 104229
diff changeset
189 (defvar next-error-move-function nil
81a43a652b4b (next-error-move-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 104229
diff changeset
190 "Function to use to move to an error locus.
81a43a652b4b (next-error-move-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 104229
diff changeset
191 It takes two arguments, a buffer position in the error buffer
81a43a652b4b (next-error-move-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 104229
diff changeset
192 and a buffer position in the error locus buffer.
81a43a652b4b (next-error-move-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 104229
diff changeset
193 The buffer for the error locus should already be current.
81a43a652b4b (next-error-move-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 104229
diff changeset
194 nil means use goto-char using the second argument position.")
81a43a652b4b (next-error-move-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 104229
diff changeset
195 (make-variable-buffer-local 'next-error-move-function)
81a43a652b4b (next-error-move-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 104229
diff changeset
196
58951
c7ebd794182b (next-error-buffer-p, next-error-find-buffer): Doc fix.
Juri Linkov <juri@jurta.org>
parents: 58917
diff changeset
197 (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
198 &optional avoid-current
58951
c7ebd794182b (next-error-buffer-p, next-error-find-buffer): Doc fix.
Juri Linkov <juri@jurta.org>
parents: 58917
diff changeset
199 extra-test-inclusive
58625
31d0b9422d7b simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents: 58354
diff changeset
200 extra-test-exclusive)
64548
cff17c5abe4d (clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64289
diff changeset
201 "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
202
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
203 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
204 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
205
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
206 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
207 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
208 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
209
67777
8eda669e2619 (get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents: 67621
diff changeset
210 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
211 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
212 that buffer is rejected."
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
213 (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
214 (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
215 (with-current-buffer buffer
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
216 (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
217 ;; Optionally reject some buffers.
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
218 (if extra-test-exclusive
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
219 (funcall extra-test-exclusive)
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
220 t)
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
221 ;; Optionally accept some other buffers.
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
222 (and extra-test-inclusive
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
223 (funcall extra-test-inclusive))))))
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
224
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
225 (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
226 extra-test-inclusive
58625
31d0b9422d7b simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents: 58354
diff changeset
227 extra-test-exclusive)
64548
cff17c5abe4d (clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64289
diff changeset
228 "Return a `next-error' capable buffer.
67777
8eda669e2619 (get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents: 67621
diff changeset
229
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
230 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
231 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
232
63592
153f4469d91a (next-error-buffer-p, next-error-find-buffer): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 63487
diff changeset
233 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
234 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
235 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
236
67777
8eda669e2619 (get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents: 67621
diff changeset
237 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
238 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
239 that buffer is rejected."
56862
adba247afe3f * simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents: 56861
diff changeset
240 (or
adba247afe3f * simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents: 56861
diff changeset
241 ;; 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
242 (let ((window-buffers
adba247afe3f * simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents: 56861
diff changeset
243 (delete-dups
adba247afe3f * simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents: 56861
diff changeset
244 (delq nil (mapcar (lambda (w)
adba247afe3f * simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents: 56861
diff changeset
245 (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
246 (window-buffer w)
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
247 avoid-current
58951
c7ebd794182b (next-error-buffer-p, next-error-find-buffer): Doc fix.
Juri Linkov <juri@jurta.org>
parents: 58917
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 (window-buffer w)))
adba247afe3f * simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents: 56861
diff changeset
250 (window-list))))))
adba247afe3f * simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents: 56861
diff changeset
251 (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
252 (car window-buffers)))
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
253 ;; 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
254 (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
255 (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
256 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
257 next-error-last-buffer)
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
258 ;; 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
259 (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
260 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
261 (current-buffer))
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
262 ;; 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
263 (let ((buffers (buffer-list)))
adba247afe3f * simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents: 56861
diff changeset
264 (while (and buffers
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
265 (not (next-error-buffer-p
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
266 (car buffers) avoid-current
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
267 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
268 (setq buffers (cdr buffers)))
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
269 (car buffers))
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
270 ;; 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
271 ;; even despite AVOID-CURRENT.
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
272 (and avoid-current
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
273 (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
274 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
275 (progn
74283
2ba390dee911 (next-error-find-buffer): Improve messages.
Richard M. Stallman <rms@gnu.org>
parents: 73605
diff changeset
276 (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
277 (current-buffer)))
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
278 ;; 6. Give up.
74283
2ba390dee911 (next-error-find-buffer): Improve messages.
Richard M. Stallman <rms@gnu.org>
parents: 73605
diff changeset
279 (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
280
56861
2e59d9187762 (next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents: 56761
diff changeset
281 (defun next-error (&optional arg reset)
64548
cff17c5abe4d (clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64289
diff changeset
282 "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
283
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
284 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
285 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
286
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
287 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
288 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
289 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
290 and start at the first error.
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
291
55425
1acbf23561f5 (next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 55294
diff changeset
292 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
293
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
294 \\[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
295 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
296 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
297 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
298 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
299 `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
300 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
301 \\[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
302 in the current frame.
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
303
64195
c8096b015bf1 (next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
304 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
305 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
306 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
307 or Compilation Minor mode.
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
308
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
309 See variables `compilation-parse-errors-function' and
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
310 \`compilation-error-regexp-alist' for customization ideas."
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
311 (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
312 (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
313 (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
314 ;; 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
315 (with-current-buffer next-error-last-buffer
64195
c8096b015bf1 (next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
316 (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
317 (when next-error-recenter
a39eb4ca5597 (next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 77750
diff changeset
318 (recenter next-error-recenter))
64195
c8096b015bf1 (next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents: 64091
diff changeset
319 (run-hooks 'next-error-hook))))
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
320
65782
d88ec92a0f15 (next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents: 65698
diff changeset
321 (defun next-error-internal ()
d88ec92a0f15 (next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents: 65698
diff changeset
322 "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
323 (setq next-error-last-buffer (current-buffer))
d88ec92a0f15 (next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents: 65698
diff changeset
324 ;; 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
325 (with-current-buffer next-error-last-buffer
d88ec92a0f15 (next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents: 65698
diff changeset
326 (funcall next-error-function 0 nil)
81551
a39eb4ca5597 (next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 77750
diff changeset
327 (when next-error-recenter
a39eb4ca5597 (next-error-recenter): New defcustom.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 77750
diff changeset
328 (recenter next-error-recenter))
65782
d88ec92a0f15 (next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents: 65698
diff changeset
329 (run-hooks 'next-error-hook)))
d88ec92a0f15 (next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents: 65698
diff changeset
330
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
331 (defalias 'goto-next-locus 'next-error)
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
332 (defalias 'next-match 'next-error)
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
333
56861
2e59d9187762 (next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents: 56761
diff changeset
334 (defun previous-error (&optional n)
64548
cff17c5abe4d (clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64289
diff changeset
335 "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
336
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
337 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
338 forwards, if negative).
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
339
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] and \\[grep] commands."
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
341 (interactive "p")
56861
2e59d9187762 (next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents: 56761
diff changeset
342 (next-error (- (or n 1))))
2e59d9187762 (next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents: 56761
diff changeset
343
2e59d9187762 (next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents: 56761
diff changeset
344 (defun first-error (&optional n)
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
345 "Restart at the first error.
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
346 Visit corresponding source code.
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
347 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
348 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
349 (interactive "p")
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
350 (next-error n t))
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
351
56861
2e59d9187762 (next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents: 56761
diff changeset
352 (defun next-error-no-select (&optional n)
64548
cff17c5abe4d (clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64289
diff changeset
353 "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
354 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
355 backwards, if negative).
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
356 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
357 select the source buffer."
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
358 (interactive "p")
56863
c8bb5aca0581 * simple.el (next-error): New defgroup and defface.
Juri Linkov <juri@jurta.org>
parents: 56862
diff changeset
359 (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
360 (next-error n))
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
361 (pop-to-buffer next-error-last-buffer))
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
362
56861
2e59d9187762 (next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents: 56761
diff changeset
363 (defun previous-error-no-select (&optional n)
64548
cff17c5abe4d (clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64289
diff changeset
364 "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
365 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
366 forwards, if negative).
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
367 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
368 select the source buffer."
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
369 (interactive "p")
56861
2e59d9187762 (next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents: 56761
diff changeset
370 (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
371
104345
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
372 ;; Internal variable for `next-error-follow-mode-post-command-hook'.
56918
2e166bd5683b (next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents: 56863
diff changeset
373 (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
374
56926
f8e248e9a717 Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents: 56918
diff changeset
375 (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
376 "Minor mode for compilation, occur and diff modes.
56926
f8e248e9a717 Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents: 56918
diff changeset
377 When turned on, cursor motion in the compilation, grep, occur or diff
f8e248e9a717 Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents: 56918
diff changeset
378 buffer causes automatic display of the corresponding source code
f8e248e9a717 Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents: 56918
diff changeset
379 location."
64991
942d4ce7c22d (next-error-follow-minor-mode): Fix init value and
Dan Nicolaescu <dann@ics.uci.edu>
parents: 64911
diff changeset
380 :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
381 (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
382 (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
383 (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
384 (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
385
104345
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
386 ;; Used as a `post-command-hook' by `next-error-follow-mode'
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
387 ;; for the *Compilation* *grep* and *Occur* buffers.
56918
2e166bd5683b (next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents: 56863
diff changeset
388 (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
389 (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
390 (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
391 (condition-case nil
2e166bd5683b (next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents: 56863
diff changeset
392 (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
393 (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
394 (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
395 (error t))))
2e166bd5683b (next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents: 56863
diff changeset
396
56863
c8bb5aca0581 * simple.el (next-error): New defgroup and defface.
Juri Linkov <juri@jurta.org>
parents: 56862
diff changeset
397
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
398 ;;;
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
399
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
400 (defun fundamental-mode ()
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
401 "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
402 Other major modes are defined by comparison with this one."
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
403 (interactive)
57146
942b8e28d21a (fundamental-mode): Run `after-change-major-mode-hook'.
Luc Teirlinck <teirllm@auburn.edu>
parents: 57069
diff changeset
404 (kill-all-local-variables)
108154
cede0252a395 Make it possible to locally disable a globally enabled mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107875
diff changeset
405 (run-mode-hooks 'fundamental-mode-hook))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
406
96124
48b2db6b4c28 (special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95526
diff changeset
407 ;; 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
408
48b2db6b4c28 (special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95526
diff changeset
409 (defvar special-mode-map
48b2db6b4c28 (special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95526
diff changeset
410 (let ((map (make-sparse-keymap)))
48b2db6b4c28 (special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95526
diff changeset
411 (suppress-keymap map)
48b2db6b4c28 (special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95526
diff changeset
412 (define-key map "q" 'quit-window)
48b2db6b4c28 (special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95526
diff changeset
413 (define-key map " " 'scroll-up)
48b2db6b4c28 (special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95526
diff changeset
414 (define-key map "\C-?" 'scroll-down)
48b2db6b4c28 (special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95526
diff changeset
415 (define-key map "?" 'describe-mode)
48b2db6b4c28 (special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95526
diff changeset
416 (define-key map ">" 'end-of-buffer)
48b2db6b4c28 (special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95526
diff changeset
417 (define-key map "<" 'beginning-of-buffer)
48b2db6b4c28 (special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95526
diff changeset
418 (define-key map "g" 'revert-buffer)
48b2db6b4c28 (special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95526
diff changeset
419 map))
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
420
96124
48b2db6b4c28 (special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95526
diff changeset
421 (put 'special-mode 'mode-class 'special)
48b2db6b4c28 (special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95526
diff changeset
422 (define-derived-mode special-mode nil "Special"
48b2db6b4c28 (special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95526
diff changeset
423 "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
424 (setq buffer-read-only t))
48b2db6b4c28 (special-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95526
diff changeset
425
108574
27a878644c60 * simple.el (prog-mode): New (abstract) major mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108296
diff changeset
426 ;; Major mode meant to be the parent of programming modes.
27a878644c60 * simple.el (prog-mode): New (abstract) major mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108296
diff changeset
427
109846
dce0738d09ef * lisp/simple.el (prog-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109802
diff changeset
428 (defvar prog-mode-map
dce0738d09ef * lisp/simple.el (prog-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109802
diff changeset
429 (let ((map (make-sparse-keymap)))
dce0738d09ef * lisp/simple.el (prog-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109802
diff changeset
430 (define-key map [?\C-\M-q] 'prog-indent-sexp)
dce0738d09ef * lisp/simple.el (prog-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109802
diff changeset
431 map)
dce0738d09ef * lisp/simple.el (prog-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109802
diff changeset
432 "Keymap used for programming modes.")
dce0738d09ef * lisp/simple.el (prog-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109802
diff changeset
433
dce0738d09ef * lisp/simple.el (prog-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109802
diff changeset
434 (defun prog-indent-sexp ()
dce0738d09ef * lisp/simple.el (prog-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109802
diff changeset
435 "Indent the expression after point."
dce0738d09ef * lisp/simple.el (prog-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109802
diff changeset
436 (interactive)
dce0738d09ef * lisp/simple.el (prog-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109802
diff changeset
437 (let ((start (point))
dce0738d09ef * lisp/simple.el (prog-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109802
diff changeset
438 (end (save-excursion (forward-sexp 1) (point))))
dce0738d09ef * lisp/simple.el (prog-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109802
diff changeset
439 (indent-region start end nil)))
dce0738d09ef * lisp/simple.el (prog-mode-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109802
diff changeset
440
108574
27a878644c60 * simple.el (prog-mode): New (abstract) major mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108296
diff changeset
441 (define-derived-mode prog-mode fundamental-mode "Prog"
27a878644c60 * simple.el (prog-mode): New (abstract) major mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108296
diff changeset
442 "Major mode for editing programming language source code."
27a878644c60 * simple.el (prog-mode): New (abstract) major mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108296
diff changeset
443 (set (make-local-variable 'require-final-newline) mode-require-final-newline)
27a878644c60 * simple.el (prog-mode): New (abstract) major mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108296
diff changeset
444 (set (make-local-variable 'parse-sexp-ignore-comments) t))
27a878644c60 * simple.el (prog-mode): New (abstract) major mode.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108296
diff changeset
445
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
446 ;; Making and deleting lines.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
447
105051
b24c3613ac28 (hard-newline): Give it a doc-string.
Glenn Morris <rgm@gnu.org>
parents: 105009
diff changeset
448 (defvar hard-newline (propertize "\n" 'hard t 'rear-nonsticky '(hard))
b24c3613ac28 (hard-newline): Give it a doc-string.
Glenn Morris <rgm@gnu.org>
parents: 105009
diff changeset
449 "Propertized string representing a hard newline character.")
66965
1bca10e9d192 * simple.el (hard-newline): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66950
diff changeset
450
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
451 (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
452 "Insert a newline, and move to left margin of the new line if it's blank.
42128
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
453 If `use-hard-newlines' is non-nil, the newline is marked with the
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
454 text-property `hard'.
31978
3a5e22f4cd99 (read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31573
diff changeset
455 With ARG, insert that many newlines.
42128
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
456 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
457 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
458 (interactive "*P")
13137
a83a1515fd9b (newline): Call barf-if-buffer-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 12975
diff changeset
459 (barf-if-buffer-read-only)
110160
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
460 ;; Call self-insert so that auto-fill, abbrev expansion etc. happens.
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
461 ;; Set last-command-event to tell self-insert what to insert.
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
462 (let* ((was-page-start (and (bolp) (looking-at page-delimiter)))
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
463 (beforepos (point))
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
464 (last-command-event ?\n)
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
465 ;; Don't auto-fill if we have a numeric argument.
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
466 (auto-fill-function (if arg nil auto-fill-function))
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
467 (postproc
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
468 ;; Do the rest in post-self-insert-hook, because we want to do it
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
469 ;; *before* other functions on that hook.
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
470 (lambda ()
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
471 ;; Mark the newline(s) `hard'.
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
472 (if use-hard-newlines
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
473 (set-hard-newline-properties
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
474 (- (point) (prefix-numeric-value arg)) (point)))
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
475 ;; If the newline leaves the previous line blank, and we
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
476 ;; have a left margin, delete that from the blank line.
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
477 (save-excursion
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
478 (goto-char beforepos)
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
479 (beginning-of-line)
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
480 (and (looking-at "[ \t]$")
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
481 (> (current-left-margin) 0)
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
482 (delete-region (point)
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
483 (line-end-position))))
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
484 ;; Indent the line after the newline, except in one case:
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
485 ;; when we added the newline at the beginning of a line which
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
486 ;; starts a page.
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
487 (or was-page-start
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
488 (move-to-left-margin nil t)))))
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
489 (unwind-protect
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
490 (progn
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
491 (add-hook 'post-self-insert-hook postproc)
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
492 (self-insert-command (prefix-numeric-value arg)))
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
493 ;; We first used let-binding to protect the hook, but that was naive
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
494 ;; since add-hook affects the symbol-default value of the variable,
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
495 ;; whereas the let-binding might only protect the buffer-local value.
c32f6ba217a2 * lisp/simple.el (newline): Fix last change to properly remove itself from
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110155
diff changeset
496 (remove-hook 'post-self-insert-hook postproc)))
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
497 nil)
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
498
16018
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
499 (defun set-hard-newline-properties (from to)
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
500 (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
501 (put-text-property from to 'hard 't)
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
502 ;; 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
503 (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
504 (put-text-property from (point) 'rear-nonsticky
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
505 (cons 'hard sticky)))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
506
55425
1acbf23561f5 (next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 55294
diff changeset
507 (defun open-line (n)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
508 "Insert a newline and leave point before it.
64548
cff17c5abe4d (clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64289
diff changeset
509 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
510 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
511 With arg N, insert N newlines."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
512 (interactive "*p")
1063
25b929c06f83 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1039
diff changeset
513 (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
514 (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
515 (loc (point))
e334380bbb2c (next-line): Don't let `newline' expand abbrevs.
Gerd Moellmann <gerd@gnu.org>
parents: 35346
diff changeset
516 ;; 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
517 (abbrev-mode nil))
55425
1acbf23561f5 (next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 55294
diff changeset
518 (newline n)
11324
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
519 (goto-char loc)
55425
1acbf23561f5 (next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 55294
diff changeset
520 (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
521 (cond ((bolp)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
522 (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
523 (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
524 (forward-line 1)
55425
1acbf23561f5 (next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 55294
diff changeset
525 (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
526 (goto-char loc)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
527 (end-of-line)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
528
49032
5dbb47300a5b (split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents: 48984
diff changeset
529 (defun split-line (&optional arg)
5dbb47300a5b (split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents: 48984
diff changeset
530 "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
531 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
532 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
533
1acbf23561f5 (next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 55294
diff changeset
534 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
535 (interactive "*P")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
536 (skip-chars-forward " \t")
49066
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
537 (let* ((col (current-column))
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
538 (pos (point))
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
539 ;; 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
540 (prefix (cond ((stringp arg) arg)
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
541 (arg nil)
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
542 (t fill-prefix)))
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
543 ;; Does this line start with it?
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
544 (have-prfx (and prefix
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
545 (save-excursion
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
546 (beginning-of-line)
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
547 (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
548 (newline 1)
49066
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
549 (if have-prfx (insert-and-inherit prefix))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
550 (indent-to col 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
551 (goto-char pos)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
552
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
553 (defun delete-indentation (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
554 "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
555 If there is a fill prefix, delete it from the beginning of this line.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
556 With argument, join this line to following line."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
557 (interactive "*P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
558 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
559 (if arg (forward-line 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
560 (if (eq (preceding-char) ?\n)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
561 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
562 (delete-region (point) (1- (point)))
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
563 ;; If the second line started with the fill prefix,
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
564 ;; delete the prefix.
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
565 (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
566 (<= (+ (point) (length fill-prefix)) (point-max))
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
567 (string= fill-prefix
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
568 (buffer-substring (point)
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
569 (+ (point) (length fill-prefix)))))
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
570 (delete-region (point) (+ (point) (length fill-prefix))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
571 (fixup-whitespace))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
572
24078
4de23887487f (join-line): New alias.
Dave Love <fx@gnu.org>
parents: 24028
diff changeset
573 (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
574
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
575 (defun delete-blank-lines ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
576 "On blank line, delete all surrounding blank lines, leaving just one.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
577 On isolated blank line, delete that one.
7817
d729f75fff04 (delete-blank-lines): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 7762
diff changeset
578 On nonblank line, delete any immediately following blank lines."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
579 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
580 (let (thisblank singleblank)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
581 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
582 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
583 (setq thisblank (looking-at "[ \t]*$"))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
584 ;; Set singleblank if there is just one blank line here.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
585 (setq singleblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
586 (and thisblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
587 (not (looking-at "[ \t]*\n[ \t]*$"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
588 (or (bobp)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
589 (progn (forward-line -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
590 (not (looking-at "[ \t]*$")))))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
591 ;; Delete preceding blank lines, and this one too if it's the only one.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
592 (if thisblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
593 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
594 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
595 (if singleblank (forward-line 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
596 (delete-region (point)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
597 (if (re-search-backward "[^ \t\n]" nil t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
598 (progn (forward-line 1) (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
599 (point-min)))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
600 ;; Delete following blank lines, unless the current line is blank
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
601 ;; and there are no following blank lines.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
602 (if (not (and thisblank singleblank))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
603 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
604 (end-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
605 (forward-line 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
606 (delete-region (point)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
607 (if (re-search-forward "[^ \t\n]" nil t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
608 (progn (beginning-of-line) (point))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
609 (point-max)))))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
610 ;; Handle the special case where point is followed by newline and eob.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
611 ;; Delete the line, leaving point at eob.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
612 (if (looking-at "^[ \t]*\n\\'")
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
613 (delete-region (point) (point-max)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
614
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
615 (defun delete-trailing-whitespace ()
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
616 "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
617 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
618 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
619 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
620 (interactive "*")
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
621 (save-match-data
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
622 (save-excursion
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
623 (goto-char (point-min))
34141
799f637fbc35 (delete-trailing-whitespace): Don't delete newlines too.
Miles Bader <miles@gnu.org>
parents: 34101
diff changeset
624 (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
625 (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
626 ;; 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
627 (save-match-data
08dafe901c44 (delete-trailing-whitespace): Save match data
Gerd Moellmann <gerd@gnu.org>
parents: 38432
diff changeset
628 (if (looking-at ".*\f")
08dafe901c44 (delete-trailing-whitespace): Save match data
Gerd Moellmann <gerd@gnu.org>
parents: 38432
diff changeset
629 (goto-char (match-end 0))))
34619
237139766bdc (delete-trailing-whitespace): Remove extraneous let.
Miles Bader <miles@gnu.org>
parents: 34570
diff changeset
630 (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
631
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
632 (defun newline-and-indent ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
633 "Insert a newline, then indent according to major mode.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
634 Indentation is done using the value of `indent-line-function'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
635 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
636 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
637 column specified by the function `current-left-margin'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
638 (interactive "*")
34462
6a7373de926f (delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents: 34443
diff changeset
639 (delete-horizontal-space t)
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
640 (newline)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
641 (indent-according-to-mode))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
642
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
643 (defun reindent-then-newline-and-indent ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
644 "Reindent current line, insert newline, then indent the new line.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
645 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
646 which means calling the current value of `indent-line-function'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
647 In programming language modes, this is the same as TAB.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
648 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
649 column specified by the function `current-left-margin'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
650 (interactive "*")
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
651 (let ((pos (point)))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
652 ;; 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
653 ;; 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
654 (newline)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
655 (save-excursion
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
656 (goto-char pos)
85602
9a8400cb685c (reindent-then-newline-and-indent): Use a `move after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85514
diff changeset
657 ;; 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
658 ;; 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
659 ;; 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
660 ;; 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
661 ;; by hand.
9a8400cb685c (reindent-then-newline-and-indent): Use a `move after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85514
diff changeset
662 (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
663 (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
664 (goto-char pos)
9a8400cb685c (reindent-then-newline-and-indent): Use a `move after
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85514
diff changeset
665 ;; 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
666 ;; 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
667 (delete-horizontal-space t))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
668 (indent-according-to-mode)))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
669
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
670 (defun quoted-insert (arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
671 "Read next input character and insert it.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
672 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
673 With argument, insert ARG copies of the character.
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
674
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
675 If the first character you type after this command is an octal digit,
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
676 you should type a sequence of octal digits which specify a character code.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
677 Any nondigit terminates the sequence. If the terminator is a RET,
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
678 it is discarded; any other terminator is used itself as input.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
679 The variable `read-quoted-char-radix' specifies the radix for this feature;
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
680 set it to 10 or 16 to use decimal or hex instead of octal.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
681
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
682 In overwrite mode, this function inserts the character anyway, and
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
683 does not handle octal digits specially. This means that if you use
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
684 overwrite as your normal editing mode, you can use this function to
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
685 insert characters when necessary.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
686
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
687 In binary overwrite mode, this function does overwrite, and octal
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
688 digits are interpreted as a character code. This is intended to be
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
689 useful for editing binary files."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
690 (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
691 (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
692 ;; 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
693 (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
694 (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
695 (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
696 (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
697 (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
698 (read-char))))))
97128
716070916653 (quoted-insert): Comment out code that treats 0240-0377 specially.
Juri Linkov <juri@jurta.org>
parents: 97043
diff changeset
699 ;; 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
700 ;; 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
701 ;; 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
702 ;; 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
703 ;; (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
704 ;; (>= char ?\240)
716070916653 (quoted-insert): Comment out code that treats 0240-0377 specially.
Juri Linkov <juri@jurta.org>
parents: 97043
diff changeset
705 ;; (<= char ?\377))
716070916653 (quoted-insert): Comment out code that treats 0240-0377 specially.
Juri Linkov <juri@jurta.org>
parents: 97043
diff changeset
706 ;; (setq char (unibyte-char-to-multibyte char)))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
707 (if (> arg 0)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
708 (if (eq overwrite-mode 'overwrite-mode-binary)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
709 (delete-char arg)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
710 (while (> arg 0)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
711 (insert-and-inherit char)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
712 (setq arg (1- arg)))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
713
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
714 (defun forward-to-indentation (&optional arg)
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
715 "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
716 (interactive "^p")
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
717 (forward-line (or arg 1))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
718 (skip-chars-forward " \t"))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
719
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
720 (defun backward-to-indentation (&optional arg)
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
721 "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
722 (interactive "^p")
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
723 (forward-line (- (or arg 1)))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
724 (skip-chars-forward " \t"))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
725
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
726 (defun back-to-indentation ()
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
727 "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
728 (interactive "^")
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
729 (beginning-of-line 1)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
730 (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
731 ;; 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
732 (backward-prefix-chars))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
733
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
734 (defun fixup-whitespace ()
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
735 "Fixup white space between objects around point.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
736 Leave one space or none, according to the context."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
737 (interactive "*")
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
738 (save-excursion
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
739 (delete-horizontal-space)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
740 (if (or (looking-at "^\\|\\s)")
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
741 (save-excursion (forward-char -1)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
742 (looking-at "$\\|\\s(\\|\\s'")))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
743 nil
64548
cff17c5abe4d (clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64289
diff changeset
744 (insert ?\s))))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
745
34462
6a7373de926f (delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents: 34443
diff changeset
746 (defun delete-horizontal-space (&optional backward-only)
6a7373de926f (delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents: 34443
diff changeset
747 "Delete all spaces and tabs around point.
74848
75360a225c60 (delete-horizontal-space): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 74701
diff changeset
748 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
749 (interactive "*P")
37791
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
750 (let ((orig-pos (point)))
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
751 (delete-region
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
752 (if backward-only
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
753 orig-pos
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
754 (progn
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
755 (skip-chars-forward " \t")
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
756 (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
757 (progn
37791
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
758 (skip-chars-backward " \t")
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
759 (constrain-to-field nil orig-pos)))))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
760
59598
9782a4d3aef5 (just-one-space): Make arg optional.
Kim F. Storm <storm@cua.dk>
parents: 59567
diff changeset
761 (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
762 "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
763 (interactive "*p")
37791
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
764 (let ((orig-pos (point)))
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
765 (skip-chars-backward " \t")
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
766 (constrain-to-field nil orig-pos)
59598
9782a4d3aef5 (just-one-space): Make arg optional.
Kim F. Storm <storm@cua.dk>
parents: 59567
diff changeset
767 (dotimes (i (or n 1))
64548
cff17c5abe4d (clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64289
diff changeset
768 (if (= (following-char) ?\s)
59567
638fd0a9f545 (just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents: 59486
diff changeset
769 (forward-char 1)
64548
cff17c5abe4d (clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64289
diff changeset
770 (insert ?\s)))
37791
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
771 (delete-region
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
772 (point)
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
773 (progn
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
774 (skip-chars-forward " \t")
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
775 (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
776
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
777 (defun beginning-of-buffer (&optional arg)
110118
b2115e1dafc0 * simple.el (beginning-of-buffer, end-of-buffer): Doc fix (Bug#6907).
Chong Yidong <cyd@stupidchicken.com>
parents: 109926
diff changeset
778 "Move point to the beginning of the buffer.
56432
af62749c9497 (inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents: 56378
diff changeset
779 With numeric arg N, put point N/10 of the way from the beginning.
110118
b2115e1dafc0 * simple.el (beginning-of-buffer, end-of-buffer): Doc fix (Bug#6907).
Chong Yidong <cyd@stupidchicken.com>
parents: 109926
diff changeset
780 If the buffer is narrowed, this command uses the beginning of the
b2115e1dafc0 * simple.el (beginning-of-buffer, end-of-buffer): Doc fix (Bug#6907).
Chong Yidong <cyd@stupidchicken.com>
parents: 109926
diff changeset
781 accessible part of the buffer.
b2115e1dafc0 * simple.el (beginning-of-buffer, end-of-buffer): Doc fix (Bug#6907).
Chong Yidong <cyd@stupidchicken.com>
parents: 109926
diff changeset
782
b2115e1dafc0 * simple.el (beginning-of-buffer, end-of-buffer): Doc fix (Bug#6907).
Chong Yidong <cyd@stupidchicken.com>
parents: 109926
diff changeset
783 If Transient Mark mode is disabled, leave mark at previous
b2115e1dafc0 * simple.el (beginning-of-buffer, end-of-buffer): Doc fix (Bug#6907).
Chong Yidong <cyd@stupidchicken.com>
parents: 109926
diff changeset
784 position, unless a \\[universal-argument] prefix is supplied.
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!
110118
b2115e1dafc0 * simple.el (beginning-of-buffer, end-of-buffer): Doc fix (Bug#6907).
Chong Yidong <cyd@stupidchicken.com>
parents: 109926
diff changeset
787 \(goto-char (point-min)) is faster."
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
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
802
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
803 (defun end-of-buffer (&optional arg)
110118
b2115e1dafc0 * simple.el (beginning-of-buffer, end-of-buffer): Doc fix (Bug#6907).
Chong Yidong <cyd@stupidchicken.com>
parents: 109926
diff changeset
804 "Move point to the end of the buffer.
56432
af62749c9497 (inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents: 56378
diff changeset
805 With numeric arg N, put point N/10 of the way from the end.
110118
b2115e1dafc0 * simple.el (beginning-of-buffer, end-of-buffer): Doc fix (Bug#6907).
Chong Yidong <cyd@stupidchicken.com>
parents: 109926
diff changeset
806 If the buffer is narrowed, this command uses the end of the
b2115e1dafc0 * simple.el (beginning-of-buffer, end-of-buffer): Doc fix (Bug#6907).
Chong Yidong <cyd@stupidchicken.com>
parents: 109926
diff changeset
807 accessible part of the buffer.
b2115e1dafc0 * simple.el (beginning-of-buffer, end-of-buffer): Doc fix (Bug#6907).
Chong Yidong <cyd@stupidchicken.com>
parents: 109926
diff changeset
808
b2115e1dafc0 * simple.el (beginning-of-buffer, end-of-buffer): Doc fix (Bug#6907).
Chong Yidong <cyd@stupidchicken.com>
parents: 109926
diff changeset
809 If Transient Mark mode is disabled, leave mark at previous
b2115e1dafc0 * simple.el (beginning-of-buffer, end-of-buffer): Doc fix (Bug#6907).
Chong Yidong <cyd@stupidchicken.com>
parents: 109926
diff changeset
810 position, unless a \\[universal-argument] prefix is supplied.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
811
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
812 Don't use this command in Lisp programs!
110118
b2115e1dafc0 * simple.el (beginning-of-buffer, end-of-buffer): Doc fix (Bug#6907).
Chong Yidong <cyd@stupidchicken.com>
parents: 109926
diff changeset
813 \(goto-char (point-max)) is faster."
93548
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
814 (interactive "^P")
93561
e39e5bb86d6b (beginning-of-buffer, end-of-buffer, goto-line, undo)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93548
diff changeset
815 (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
816 (let ((size (- (point-max) (point-min))))
56432
af62749c9497 (inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents: 56378
diff changeset
817 (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
818 (- (point-max)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
819 (if (> size 10000)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
820 ;; Avoid overflow for large buffer sizes!
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
821 (* (prefix-numeric-value arg)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
822 (/ size 10))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
823 (/ (* size (prefix-numeric-value arg)) 10)))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
824 (point-max))))
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
825 ;; 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
826 ;; 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
827 (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
828 ((> (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
829 ;; 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
830 ;; 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
831 (overlay-recenter (point))
bcd25953e4cf (end-of-buffer): Use window-end to find the window end
Gerd Moellmann <gerd@gnu.org>
parents: 26201
diff changeset
832 (recenter -3))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
833
109062
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
834 (defcustom delete-active-region t
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
835 "Whether single-char deletion commands delete an active region.
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
836 This has an effect only if Transient Mark mode is enabled, and
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
837 affects `delete-forward-char' and `delete-backward-char', though
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
838 not `delete-char'.
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
839
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
840 If the value is the symbol `kill', the active region is killed
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
841 instead of deleted."
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
842 :type '(choice (const :tag "Delete active region" t)
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
843 (const :tag "Kill active region" kill)
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
844 (const :tag "Do ordinary deletion" nil))
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
845 :group 'editing
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
846 :version "24.1")
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
847
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
848 (defun delete-backward-char (n &optional killflag)
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
849 "Delete the previous N characters (following if N is negative).
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
850 If Transient Mark mode is enabled, the mark is active, and N is 1,
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
851 delete the text in the region and deactivate the mark instead.
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
852 To disable this, set `delete-active-region' to nil.
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
853
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
854 Optional second arg KILLFLAG, if non-nil, means to kill (save in
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
855 kill ring) instead of delete. Interactively, N is the prefix
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
856 arg, and KILLFLAG is set if N is explicitly specified.
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
857
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
858 In Overwrite mode, single character backward deletion may replace
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
859 tabs with spaces so as to back over columns, unless point is at
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
860 the end of the line."
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
861 (interactive "p\nP")
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
862 (unless (integerp n)
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
863 (signal 'wrong-type-argument (list 'integerp n)))
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
864 (cond ((and (use-region-p)
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
865 delete-active-region
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
866 (= n 1))
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
867 ;; If a region is active, kill or delete it.
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
868 (if (eq delete-active-region 'kill)
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
869 (kill-region (region-beginning) (region-end))
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
870 (delete-region (region-beginning) (region-end))))
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
871 ;; In Overwrite mode, maybe untabify while deleting
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
872 ((null (or (null overwrite-mode)
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
873 (<= n 0)
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
874 (memq (char-before) '(?\t ?\n))
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
875 (eobp)
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
876 (eq (char-after) ?\n)))
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
877 (let* ((ocol (current-column))
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
878 (val (delete-char (- n) killflag)))
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
879 (save-excursion
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
880 (insert-char ?\s (- ocol (current-column)) nil))))
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
881 ;; Otherwise, do simple deletion.
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
882 (t (delete-char (- n) killflag))))
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
883
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
884 (defun delete-forward-char (n &optional killflag)
109676
5b1f706a7622 simple.el (delete-forward-char): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 109456
diff changeset
885 "Delete the following N characters (previous if N is negative).
109062
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
886 If Transient Mark mode is enabled, the mark is active, and N is 1,
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
887 delete the text in the region and deactivate the mark instead.
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
888 To disable this, set `delete-active-region' to nil.
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
889
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
890 Optional second arg KILLFLAG non-nil means to kill (save in kill
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
891 ring) instead of delete. Interactively, N is the prefix arg, and
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
892 KILLFLAG is set if N was explicitly specified."
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
893 (interactive "p\nP")
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
894 (unless (integerp n)
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
895 (signal 'wrong-type-argument (list 'integerp n)))
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
896 (cond ((and (use-region-p)
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
897 delete-active-region
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
898 (= n 1))
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
899 ;; If a region is active, kill or delete it.
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
900 (if (eq delete-active-region 'kill)
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
901 (kill-region (region-beginning) (region-end))
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
902 (delete-region (region-beginning) (region-end))))
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
903 ;; Otherwise, do simple deletion.
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
904 (t (delete-char n killflag))))
d8144fe7f3f8 * bindings.el (global-map): Bind delete and DEL, the former to
Chong Yidong <cyd@stupidchicken.com>
parents: 109031
diff changeset
905
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
906 (defun mark-whole-buffer ()
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
907 "Put point at beginning and mark at end of buffer.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
908 You probably should not use this function in Lisp programs;
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
909 it is usually a mistake for a Lisp function to use any subroutine
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
910 that uses or sets the mark."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
911 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
912 (push-mark (point))
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
913 (push-mark (point-max) nil t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
914 (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
915
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
916
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
917 ;; Counting lines, one way or another.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
918
99799
3a08b596c63b (goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents: 99654
diff changeset
919 (defun goto-line (line &optional buffer)
3a08b596c63b (goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents: 99654
diff changeset
920 "Goto LINE, counting from line 1 at beginning of buffer.
3a08b596c63b (goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents: 99654
diff changeset
921 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
922 previous position. With just \\[universal-argument] as argument,
104229
e9dfa3ace3bb (goto-line): Fix up docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104117
diff changeset
923 move point in the most recently selected other buffer, and switch to it.
e9dfa3ace3bb (goto-line): Fix up docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104117
diff changeset
924
e9dfa3ace3bb (goto-line): Fix up docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104117
diff changeset
925 If there's a number in the buffer at point, it is the default for LINE.
e9dfa3ace3bb (goto-line): Fix up docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104117
diff changeset
926
e9dfa3ace3bb (goto-line): Fix up docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104117
diff changeset
927 This function is usually the wrong thing to use in a Lisp program.
e9dfa3ace3bb (goto-line): Fix up docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104117
diff changeset
928 What you probably want instead is something like:
e9dfa3ace3bb (goto-line): Fix up docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104117
diff changeset
929 (goto-char (point-min)) (forward-line (1- N))
e9dfa3ace3bb (goto-line): Fix up docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104117
diff changeset
930 If at all possible, an even better solution is to use char counts
e9dfa3ace3bb (goto-line): Fix up docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104117
diff changeset
931 rather than line counts."
60405
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
932 (interactive
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
933 (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
934 (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
935 ;; 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
936 (let* ((default
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
937 (save-excursion
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
938 (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
939 (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
940 (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
941 (point)
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
942 (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
943 (point))))))
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
944 ;; 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
945 (buffer
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
946 (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
947 (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
948 (buffer-prompt
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
949 (if buffer
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
950 (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
951 "")))
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
952 ;; 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
953 (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
954 "Goto line%s: ")
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
955 buffer-prompt
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
956 default)
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
957 nil nil t
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
958 'minibuffer-history
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
959 default)
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
960 buffer))))
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
961 ;; 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
962 (if buffer
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
963 (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
964 (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
965 (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
966 ;; 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
967 (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
968 ;; Move to the specified line number in that buffer.
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
969 (save-restriction
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
970 (widen)
104229
e9dfa3ace3bb (goto-line): Fix up docstring.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104117
diff changeset
971 (goto-char (point-min))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
972 (if (eq selective-display t)
99799
3a08b596c63b (goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents: 99654
diff changeset
973 (re-search-forward "[\n\C-m]" nil 'end (1- line))
3a08b596c63b (goto-line): Rename argument.
Lute Kamstra <lute@gnu.org>
parents: 99654
diff changeset
974 (forward-line (1- line)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
975
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
976 (defun count-lines-region (start end)
3591
507f64624555 Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents: 3487
diff changeset
977 "Print number of lines and characters in the region."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
978 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
979 (message "Region has %d lines, %d characters"
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
980 (count-lines start end) (- end start)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
981
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
982 (defun what-line ()
12939
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
983 "Print the current buffer line number and narrowed line number of point."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
984 (interactive)
58754
b41534d7c63c (blink-matching-open): Obey syntax-table text properties.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58625
diff changeset
985 (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
986 (n (line-number-at-pos)))
53677
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
987 (if (= start 1)
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
988 (message "Line %d" n)
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
989 (save-excursion
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
990 (save-restriction
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
991 (widen)
54058
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
992 (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
993 (+ 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
994
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
995 (defun count-lines (start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
996 "Return number of lines between START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
997 This is usually the number of newlines between them,
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
998 but can be one more if START is not equal to END
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
999 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
1000 (save-excursion
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
1001 (save-restriction
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
1002 (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
1003 (goto-char (point-min))
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
1004 (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
1005 (save-match-data
2421
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
1006 (let ((done 0))
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
1007 (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
1008 (setq done (+ 40 done)))
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
1009 (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
1010 (setq done (+ 1 done)))
5151
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
1011 (goto-char (point-max))
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
1012 (if (and (/= start end)
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
1013 (not (bolp)))
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
1014 (1+ done)
9554
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
1015 done)))
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
1016 (- (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
1017
53839
be1da5092aa4 (line-number-at-pos): Rename from line-at-pos.
Kim F. Storm <storm@cua.dk>
parents: 53767
diff changeset
1018 (defun line-number-at-pos (&optional pos)
53677
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
1019 "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
1020 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
1021 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
1022 to the contents of the accessible portion of the buffer."
53677
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
1023 (let ((opoint (or pos (point))) start)
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
1024 (save-excursion
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
1025 (goto-char (point-min))
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
1026 (setq start (point))
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
1027 (goto-char opoint)
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
1028 (forward-line 0)
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
1029 (1+ (count-lines start (point))))))
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
1030
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
1031 (defun what-cursor-position (&optional detail)
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
1032 "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
1033 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
1034 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
1035
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
1036 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
1037 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
1038 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
1039 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
1040 byte, just \"...\" is shown.
23963
c242e2dc93a9 (what-cursor-position): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 23944
diff changeset
1041
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
1042 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
1043 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
1044 (interactive "P")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1045 (let* ((char (following-char))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1046 (beg (point-min))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1047 (end (point-max))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1048 (pos (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1049 (total (buffer-size))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1050 (percent (if (> total 50000)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1051 ;; Avoid overflow from multiplying by 100!
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1052 (/ (+ (/ total 200) (1- pos)) (max (/ total 100) 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1053 (/ (+ (/ total 2) (* 100 (1- pos))) (max total 1))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1054 (hscroll (if (= (window-hscroll) 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1055 ""
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1056 (format " Hscroll=%d" (window-hscroll))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1057 (col (current-column)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1058 (if (= pos end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1059 (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
1060 (message "point=%d of %d (%d%%) <%d-%d> column=%d%s"
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1061 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
1062 (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
1063 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
1064 (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
1065 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
1066 (if (or (not coding)
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
1067 (eq (coding-system-type coding) t))
104664
50fdf250e26b * mh-e/mh-comp.el (mh-send-letter):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104645
diff changeset
1068 (setq coding (default-value 'buffer-file-coding-system)))
89483
2f877ed80fa6 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 88123 88832
diff changeset
1069 (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
1070 (setq encoding-msg
90261
7beb78bc1f8e Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-97
Miles Bader <miles@gnu.org>
parents: 90260 68042
diff changeset
1071 (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
1072 ;; 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
1073 ;; 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
1074 ;; buffer substring covered by that property.
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1075 (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
1076 (if display-prop
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1077 (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
1078 (point-max))))
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1079 (if (< to (+ pos 4))
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1080 (setq under-display "")
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1081 (setq under-display "..."
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1082 to (+ pos 4)))
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1083 (setq under-display
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1084 (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
1085 under-display)))
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1086 (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
1087 (setq encoding-msg
65862
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1088 (if display-prop
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1089 (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
1090 (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
1091 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
1092 (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
1093 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
1094 (if encoded
67034
c6e50090a202 (what-cursor-position): Use Lisp-readable syntax for octal and hex.
Juri Linkov <juri@jurta.org>
parents: 66973
diff changeset
1095 (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
1096 char char char
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1097 (if (> (length encoded) 1)
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1098 "..."
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1099 (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
1100 (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
1101 (if detail
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
1102 ;; 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
1103 (describe-char (point)))
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
1104 (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
1105 (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
1106 (if (< char 256)
8063bfbd8b08 (what-cursor-position): Show "(composed)" if the
Kenichi Handa <handa@m17n.org>
parents: 26744
diff changeset
1107 (single-key-description char)
8063bfbd8b08 (what-cursor-position): Show "(composed)" if the
Kenichi Handa <handa@m17n.org>
parents: 26744
diff changeset
1108 (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
1109 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
1110 (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
1111 (if enable-multibyte-characters
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1112 (if (< char 128)
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1113 (single-key-description char)
8b246680b846 (what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents: 65782
diff changeset
1114 (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
1115 (single-key-description char))
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
1116 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
1117
73416
d443f2b23be1 (read-expression-map): Just set it, no defvar.
Richard M. Stallman <rms@gnu.org>
parents: 73408
diff changeset
1118 ;; 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
1119 (let ((m (make-sparse-keymap)))
d443f2b23be1 (read-expression-map): Just set it, no defvar.
Richard M. Stallman <rms@gnu.org>
parents: 73408
diff changeset
1120 (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
1121 (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
1122 (setq read-expression-map m))
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1123
4289
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
1124 (defvar read-expression-history nil)
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
1125
76386
8c1cfda1a9ec (minibuffer-completing-symbol): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 76357
diff changeset
1126 (defvar minibuffer-completing-symbol nil
8c1cfda1a9ec (minibuffer-completing-symbol): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 76357
diff changeset
1127 "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
1128
100810
8bebf3521844 (minibuffer-default): Add defvar.
Chong Yidong <cyd@stupidchicken.com>
parents: 100803
diff changeset
1129 (defvar minibuffer-default nil
8bebf3521844 (minibuffer-default): Add defvar.
Chong Yidong <cyd@stupidchicken.com>
parents: 100803
diff changeset
1130 "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
1131 The functions `read-from-minibuffer' and `completing-read' bind
8bebf3521844 (minibuffer-default): Add defvar.
Chong Yidong <cyd@stupidchicken.com>
parents: 100803
diff changeset
1132 this variable locally.")
8bebf3521844 (minibuffer-default): Add defvar.
Chong Yidong <cyd@stupidchicken.com>
parents: 100803
diff changeset
1133
25702
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
1134 (defcustom eval-expression-print-level 4
63022
5e1ac4f79779 (eval-expression-print-level)
Luc Teirlinck <teirllm@auburn.edu>
parents: 62987
diff changeset
1135 "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
1136 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
1137 :group 'lisp
42128
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
1138 :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
1139 :version "21.1")
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
1140
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
1141 (defcustom eval-expression-print-length 12
63022
5e1ac4f79779 (eval-expression-print-level)
Luc Teirlinck <teirllm@auburn.edu>
parents: 62987
diff changeset
1142 "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
1143 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
1144 :group 'lisp
42128
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
1145 :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
1146 :version "21.1")
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
1147
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
1148 (defcustom eval-expression-debug-on-error t
63022
5e1ac4f79779 (eval-expression-print-level)
Luc Teirlinck <teirllm@auburn.edu>
parents: 62987
diff changeset
1149 "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
1150 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
1151 :group 'lisp
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
1152 :type 'boolean
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
1153 :version "21.1")
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
1154
55799
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
1155 (defun eval-expression-print-format (value)
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
1156 "Format VALUE as a result of evaluated expression.
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
1157 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
1158 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
1159 display the result of expression evaluation."
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
1160 (if (and (integerp value)
56005
54d79ab53dd3 (eval-expression-print-format): Don't print additional
Juri Linkov <juri@jurta.org>
parents: 55975
diff changeset
1161 (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
1162 (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
1163 (if (boundp 'edebug-active) edebug-active)))
55799
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
1164 (let ((char-string
60007
bfdc24654127 (eval-expression-print-format): Avoid warning about edebug-active.
Richard M. Stallman <rms@gnu.org>
parents: 59996
diff changeset
1165 (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
1166 (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
1167 (prin1-char value))))
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
1168 (if char-string
66595
1d442f601f13 (eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66536
diff changeset
1169 (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
1170 (format " (#o%o, #x%x)" value value)))))
55799
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
1171
4289
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
1172 ;; We define this, rather than making `eval' interactive,
71625
22433275348d Comment munging; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 71420
diff changeset
1173 ;; 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
1174 (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
1175 &optional eval-expression-insert-value)
36021
aab41105aef0 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35940
diff changeset
1176 "Evaluate EVAL-EXPRESSION-ARG and print value in the echo area.
aab41105aef0 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35940
diff changeset
1177 Value is also consed on to front of the variable `values'.
105468
984326458339 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 105384
diff changeset
1178 Optional argument EVAL-EXPRESSION-INSERT-VALUE non-nil (interactively,
984326458339 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 105384
diff changeset
1179 with prefix argument) means insert the result into the current buffer
984326458339 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 105384
diff changeset
1180 instead of printing it in the echo area. Truncates long output
984326458339 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 105384
diff changeset
1181 according to the value of the variables `eval-expression-print-length'
984326458339 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 105384
diff changeset
1182 and `eval-expression-print-level'.
69852
a4e59f3e040c (eval-expression): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 69602
diff changeset
1183
a4e59f3e040c (eval-expression): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 69602
diff changeset
1184 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
1185 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
1186 (interactive
76386
8c1cfda1a9ec (minibuffer-completing-symbol): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 76357
diff changeset
1187 (list (let ((minibuffer-completing-symbol t))
8c1cfda1a9ec (minibuffer-completing-symbol): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 76357
diff changeset
1188 (read-from-minibuffer "Eval: "
8c1cfda1a9ec (minibuffer-completing-symbol): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 76357
diff changeset
1189 nil read-expression-map t
8c1cfda1a9ec (minibuffer-completing-symbol): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 76357
diff changeset
1190 '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
1191 current-prefix-arg))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
1192
27302
1cb6c18c3163 (eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents: 27298
diff changeset
1193 (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
1194 (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
1195 (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
1196 ;; 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
1197 ;; 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
1198 (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
1199 (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
1200 (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
1201 ;; 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
1202 ;; 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
1203 (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
1204 (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
1205
25702
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
1206 (let ((print-length eval-expression-print-length)
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
1207 (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
1208 (if eval-expression-insert-value
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
1209 (with-no-warnings
52566
38d8d37f129a (eval-expression): Bind standard-output in to-buffer case.
Richard M. Stallman <rms@gnu.org>
parents: 52464
diff changeset
1210 (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
1211 (prin1 (car values))))
55799
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
1212 (prog1
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
1213 (prin1 (car values) t)
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
1214 (let ((str (eval-expression-print-format (car values))))
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
1215 (if str (princ str t)))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1216
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1217 (defun edit-and-eval-command (prompt command)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1218 "Prompting with PROMPT, let user edit COMMAND and eval result.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1219 COMMAND is a Lisp expression. Let user edit that expression in
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1220 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
1221 (let ((command
53767
6cac586a9c3d (edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents: 53677
diff changeset
1222 (let ((print-level nil)
6cac586a9c3d (edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents: 53677
diff changeset
1223 (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
1224 (unwind-protect
6cac586a9c3d (edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents: 53677
diff changeset
1225 (read-from-minibuffer prompt
6cac586a9c3d (edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents: 53677
diff changeset
1226 (prin1-to-string command)
6cac586a9c3d (edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents: 53677
diff changeset
1227 read-expression-map t
6cac586a9c3d (edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents: 53677
diff changeset
1228 'command-history)
6cac586a9c3d (edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents: 53677
diff changeset
1229 ;; 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
1230 ;; 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
1231 (if (stringp (car command-history))
6cac586a9c3d (edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents: 53677
diff changeset
1232 (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
1233
53e092e189c6 (edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents: 9554
diff changeset
1234 ;; 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
1235 ;; 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
1236 (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
1237 (setq command-history (cons command command-history)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1238 (eval command)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1239
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1240 (defun repeat-complex-command (arg)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1241 "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
1242 A complex command is one which used the minibuffer.
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1243 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
1244 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
1245 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
1246 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
1247 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
1248 \\<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
1249 to get different commands to edit and resubmit."
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1250 (interactive "p")
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1251 (let ((elt (nth (1- arg) command-history))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1252 newcmd)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1253 (if elt
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1254 (progn
4821
2c16f99ef5dc (edit-and-eval-command): Let `read-from-minibuffer' manipulate the
Brian Fox <bfox@gnu.org>
parents: 4765
diff changeset
1255 (setq newcmd
16803
3d4a27ecfba9 (repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents: 16723
diff changeset
1256 (let ((print-level nil)
3d4a27ecfba9 (repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents: 16723
diff changeset
1257 (minibuffer-history-position arg)
20022
c9ed682ff86f (previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents: 19888
diff changeset
1258 (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
1259 (unwind-protect
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
1260 (read-from-minibuffer
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
1261 "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
1262 (cons 'command-history arg))
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
1263
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
1264 ;; 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
1265 ;; 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
1266 ;; evaluable expressions there.
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
1267 (if (stringp (car command-history))
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
1268 (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
1269
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
1270 ;; 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
1271 ;; add it to the history.
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
1272 (or (equal newcmd (car command-history))
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
1273 (setq command-history (cons newcmd command-history)))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1274 (eval newcmd))
48984
13c2502ecdc8 (repeat-complex-command): Signal real error on failure.
Richard M. Stallman <rms@gnu.org>
parents: 48628
diff changeset
1275 (if command-history
13c2502ecdc8 (repeat-complex-command): Signal real error on failure.
Richard M. Stallman <rms@gnu.org>
parents: 48628
diff changeset
1276 (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
1277 (error "There are no previous complex commands to repeat")))))
109957
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1278
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1279 (defun read-extended-command ()
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1280 "Read command name to invoke in `execute-extended-command'."
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1281 (minibuffer-with-setup-hook
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1282 (lambda ()
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1283 (set (make-local-variable 'minibuffer-default-add-function)
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1284 (lambda ()
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1285 ;; Get a command name at point in the original buffer
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1286 ;; to propose it after M-n.
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1287 (with-current-buffer (window-buffer (minibuffer-selected-window))
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1288 (and (commandp (function-called-at-point))
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1289 (format "%S" (function-called-at-point)))))))
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1290 ;; Read a string, completing from and restricting to the set of
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1291 ;; all defined commands. Don't provide any initial input.
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1292 ;; Save the command read on the extended-command history list.
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1293 (completing-read
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1294 (concat (cond
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1295 ((eq current-prefix-arg '-) "- ")
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1296 ((and (consp current-prefix-arg)
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1297 (eq (car current-prefix-arg) 4)) "C-u ")
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1298 ((and (consp current-prefix-arg)
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1299 (integerp (car current-prefix-arg)))
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1300 (format "%d " (car current-prefix-arg)))
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1301 ((integerp current-prefix-arg)
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1302 (format "%d " current-prefix-arg)))
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1303 ;; This isn't strictly correct if `execute-extended-command'
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1304 ;; is bound to anything else (e.g. [menu]).
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1305 ;; It could use (key-description (this-single-command-keys)),
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1306 ;; but actually a prompt other than "M-x" would be confusing,
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1307 ;; because "M-x" is a well-known prompt to read a command
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1308 ;; and it serves as a shorthand for "Extended command: ".
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1309 "M-x ")
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1310 obarray 'commandp t nil 'extended-command-history)))
083f3bd6ac6e Move reading an extended command to Elisp (bug#5364, bug#5214).
Juri Linkov <juri@jurta.org>
parents: 109954
diff changeset
1311
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
1312
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1313 (defvar minibuffer-history nil
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1314 "Default minibuffer history list.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1315 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
1316 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
1317
d5c0ef4db45d (minibuffer-history, shell-command-history): Add references to history-length
Eli Zaretskii <eliz@gnu.org>
parents: 79325
diff changeset
1318 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
1319 of `history-length', which see.")
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1320 (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
1321 "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
1322 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
1323 they are expressions; otherwise they are strings.
67777
8eda669e2619 (get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents: 67621
diff changeset
1324 \(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
1325 recursive uses of the minibuffer.)")
862
46630543d659 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 859
diff changeset
1326 (setq minibuffer-history-variable 'minibuffer-history)
70488
5087aed8b6e3 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 70369
diff changeset
1327 (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
1328 (defvar minibuffer-history-search-history nil)
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
1329
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1330 (defvar minibuffer-text-before-history nil
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1331 "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
1332 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
1333 in this use of the minibuffer.")
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1334
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1335 (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
1336
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1337 (defun minibuffer-history-initialize ()
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1338 (setq minibuffer-text-before-history nil))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1339
33683
8fc77111dd98 (minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents: 33352
diff changeset
1340 (defun minibuffer-avoid-prompt (new old)
8fc77111dd98 (minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents: 33352
diff changeset
1341 "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
1342 (constrain-to-field nil (point-max)))
8fc77111dd98 (minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents: 33352
diff changeset
1343
22257
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
1344 (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
1345 "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
1346 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
1347 \\[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
1348 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
1349 :type '(repeat variable)
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
1350 :group 'minibuffer)
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
1351
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1352 (defun previous-matching-history-element (regexp n)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1353 "Find the previous history element that matches REGEXP.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1354 \(Previous history elements refer to earlier actions.)
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1355 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
1356 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
1357 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
1358 `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
1359 makes the search case-sensitive.
22257
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
1360 See also `minibuffer-history-case-insensitive-variables'."
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1361 (interactive
2681
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
1362 (let* ((enable-recursive-minibuffers t)
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
1363 (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
1364 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
1365 minibuffer-local-map
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
1366 nil
56081
a72ee0aaa7f9 (previous-matching-history-element): Specify a default.
Richard M. Stallman <rms@gnu.org>
parents: 56005
diff changeset
1367 'minibuffer-history-search-history
a72ee0aaa7f9 (previous-matching-history-element): Specify a default.
Richard M. Stallman <rms@gnu.org>
parents: 56005
diff changeset
1368 (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
1369 ;; 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
1370 (list (if (string= regexp "")
11961
b5efbe330c86 (previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 11572
diff changeset
1371 (if minibuffer-history-search-history
b5efbe330c86 (previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 11572
diff changeset
1372 (car minibuffer-history-search-history)
b5efbe330c86 (previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 11572
diff changeset
1373 (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
1374 regexp)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1375 (prefix-numeric-value current-prefix-arg))))
32897
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1376 (unless (zerop n)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1377 (if (and (zerop minibuffer-history-position)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1378 (null minibuffer-text-before-history))
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
1379 (setq minibuffer-text-before-history
39612
309d26eb8616 (previous-matching-history-element): Fix misplaced parentheses.
Miles Bader <miles@gnu.org>
parents: 39597
diff changeset
1380 (minibuffer-contents-no-properties)))
32897
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1381 (let ((history (symbol-value minibuffer-history-variable))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1382 (case-fold-search
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1383 (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
1384 ;; On some systems, ignore case for file names.
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1385 (if (memq minibuffer-history-variable
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1386 minibuffer-history-case-insensitive-variables)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1387 t
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1388 ;; Respect the user's setting for case-fold-search:
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1389 case-fold-search)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1390 nil))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1391 prevpos
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1392 match-string
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1393 match-offset
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1394 (pos minibuffer-history-position))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1395 (while (/= n 0)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1396 (setq prevpos pos)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1397 (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
1398 (when (= pos prevpos)
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1399 (error (if (= pos 1)
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
1400 "No later matching history item"
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
1401 "No earlier matching history item")))
32897
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1402 (setq match-string
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1403 (if (eq minibuffer-history-sexp-flag (minibuffer-depth))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1404 (let ((print-level nil))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1405 (prin1-to-string (nth (1- pos) history)))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1406 (nth (1- pos) history)))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1407 (setq match-offset
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1408 (if (< n 0)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1409 (and (string-match regexp match-string)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1410 (match-end 0))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1411 (and (string-match (concat ".*\\(" regexp "\\)") match-string)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1412 (match-beginning 1))))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1413 (when match-offset
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1414 (setq n (+ n (if (< n 0) 1 -1)))))
32897
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1415 (setq minibuffer-history-position pos)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1416 (goto-char (point-max))
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
1417 (delete-minibuffer-contents)
32897
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1418 (insert match-string)
39612
309d26eb8616 (previous-matching-history-element): Fix misplaced parentheses.
Miles Bader <miles@gnu.org>
parents: 39597
diff changeset
1419 (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
1420 (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
1421 next-matching-history-element))
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1422 (setq command-history (cdr command-history))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1423
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1424 (defun next-matching-history-element (regexp n)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1425 "Find the next history element that matches REGEXP.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1426 \(The next history element refers to a more recent action.)
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1427 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
1428 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
1429 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
1430 `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
1431 makes the search case-sensitive."
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1432 (interactive
2681
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
1433 (let* ((enable-recursive-minibuffers t)
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
1434 (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
1435 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
1436 minibuffer-local-map
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
1437 nil
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
1438 'minibuffer-history-search-history
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
1439 (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
1440 ;; 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
1441 (list (if (string= regexp "")
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
1442 (if minibuffer-history-search-history
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
1443 (car minibuffer-history-search-history)
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
1444 (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
1445 regexp)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1446 (prefix-numeric-value current-prefix-arg))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1447 (previous-matching-history-element regexp (- n)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1448
32105
f80262435e6c (minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents: 31978
diff changeset
1449 (defvar minibuffer-temporary-goal-position nil)
f80262435e6c (minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents: 31978
diff changeset
1450
93397
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1451 (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
1452 "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
1453 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
1454 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
1455 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
1456 `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
1457 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
1458 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
1459 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
1460
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1461 (defvar minibuffer-default-add-done nil
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1462 "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
1463 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
1464 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
1465 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
1466
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1467 (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
1468
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1469 (defun minibuffer-default-add-completions ()
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1470 "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
1471 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
1472 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
1473 (let ((def minibuffer-default)
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1474 (all (all-completions ""
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1475 minibuffer-completion-table
105985
10cb13aa45b6 (minibuffer-default-add-completions): Drop deprecated 4th arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105965
diff changeset
1476 minibuffer-completion-predicate)))
93397
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1477 (if (listp def)
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1478 (append def all)
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1479 (cons def (delete def all)))))
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1480
82061
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1481 (defun goto-history-element (nabs)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1482 "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
1483 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
1484 (interactive "p")
93397
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1485 (when (and (not minibuffer-default-add-done)
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1486 (functionp minibuffer-default-add-function)
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1487 (< nabs (- (if (listp minibuffer-default)
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1488 (length minibuffer-default)
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1489 1))))
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1490 (setq minibuffer-default-add-done t
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1491 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
1492 (let ((minimum (if minibuffer-default
bcd144422383 (goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents: 85397
diff changeset
1493 (- (if (listp minibuffer-default)
bcd144422383 (goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents: 85397
diff changeset
1494 (length minibuffer-default)
bcd144422383 (goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents: 85397
diff changeset
1495 1))
bcd144422383 (goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents: 85397
diff changeset
1496 0))
82061
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1497 elt minibuffer-returned-to-present)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1498 (if (and (zerop minibuffer-history-position)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1499 (null minibuffer-text-before-history))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1500 (setq minibuffer-text-before-history
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1501 (minibuffer-contents-no-properties)))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1502 (if (< nabs minimum)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1503 (if minibuffer-default
93397
b532cf17d6ad (minibuffer-default-add-function): New variable with
Juri Linkov <juri@jurta.org>
parents: 93236
diff changeset
1504 (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
1505 (error "End of history; no default available")))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1506 (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
1507 (error "Beginning of history; no preceding item"))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1508 (unless (memq last-command '(next-history-element
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1509 previous-history-element))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1510 (let ((prompt-end (minibuffer-prompt-end)))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1511 (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
1512 (cond ((<= (point) prompt-end) prompt-end)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1513 ((eobp) nil)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1514 (t (point))))))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1515 (goto-char (point-max))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1516 (delete-minibuffer-contents)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1517 (setq minibuffer-history-position nabs)
85514
bcd144422383 (goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents: 85397
diff changeset
1518 (cond ((< nabs 0)
bcd144422383 (goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents: 85397
diff changeset
1519 (setq elt (if (listp minibuffer-default)
bcd144422383 (goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents: 85397
diff changeset
1520 (nth (1- (abs nabs)) minibuffer-default)
bcd144422383 (goto-history-element): Allow minibuffer-default to be
Juri Linkov <juri@jurta.org>
parents: 85397
diff changeset
1521 minibuffer-default)))
82061
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1522 ((= nabs 0)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1523 (setq elt (or minibuffer-text-before-history ""))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1524 (setq minibuffer-returned-to-present t)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1525 (setq minibuffer-text-before-history nil))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1526 (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
1527 (symbol-value minibuffer-history-variable)))))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1528 (insert
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1529 (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
1530 (not minibuffer-returned-to-present))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1531 (let ((print-level nil))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1532 (prin1-to-string elt))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1533 elt))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1534 (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
1535
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
1536 (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
1537 "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
1538 With argument N, it uses the Nth following element."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1539 (interactive "p")
10722
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
1540 (or (zerop n)
82061
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1541 (goto-history-element (- minibuffer-history-position n))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1542
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
1543 (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
1544 "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
1545 With argument N, it uses the Nth previous element."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1546 (interactive "p")
82061
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1547 (or (zerop n)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1548 (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
1549
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
1550 (defun next-complete-history-element (n)
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1551 "Get next history element which completes the minibuffer before the point.
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1552 The contents of the minibuffer after the point are deleted, and replaced
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1553 by the new completion."
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
1554 (interactive "p")
1826
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
1555 (let ((point-at-start (point)))
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
1556 (next-matching-history-element
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1557 (concat
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
1558 "^" (regexp-quote (buffer-substring (minibuffer-prompt-end) (point))))
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1559 n)
1826
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
1560 ;; 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
1561 ;; 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
1562 ;; 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
1563 (goto-char point-at-start)))
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
1564
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
1565 (defun previous-complete-history-element (n)
5324
f091cdec77e2 (next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5151
diff changeset
1566 "\
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1567 Get previous history element which completes the minibuffer before the point.
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1568 The contents of the minibuffer after the point are deleted, and replaced
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1569 by the new completion."
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
1570 (interactive "p")
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
1571 (next-complete-history-element (- n)))
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1572
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
1573 ;; For compatibility with the old subr of the same name.
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1574 (defun minibuffer-prompt-width ()
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1575 "Return the display width of the minibuffer prompt.
64548
cff17c5abe4d (clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64289
diff changeset
1576 Return 0 if current buffer is not a minibuffer."
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1577 ;; Return the width of everything before the field at the end of
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1578 ;; 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
1579 (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
1580
82061
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1581 ;; isearch minibuffer history
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1582 (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
1583
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1584 (defvar minibuffer-history-isearch-message-overlay)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1585 (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
1586
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1587 (defun minibuffer-history-isearch-setup ()
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1588 "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
1589 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
1590 (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
1591 'minibuffer-history-isearch-search)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1592 (set (make-local-variable 'isearch-message-function)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1593 'minibuffer-history-isearch-message)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1594 (set (make-local-variable 'isearch-wrap-function)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1595 'minibuffer-history-isearch-wrap)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1596 (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
1597 'minibuffer-history-isearch-push-state)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1598 (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
1599
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1600 (defun minibuffer-history-isearch-end ()
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1601 "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
1602 (if minibuffer-history-isearch-message-overlay
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1603 (delete-overlay minibuffer-history-isearch-message-overlay)))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1604
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1605 (defun minibuffer-history-isearch-search ()
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1606 "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
1607 (cond
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1608 (isearch-word
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1609 (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
1610 (t
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1611 (lambda (string bound noerror)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1612 (let ((search-fun
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1613 ;; 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
1614 (cond
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1615 (isearch-regexp
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1616 (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
1617 (t
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1618 (if isearch-forward 'search-forward 'search-backward))))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1619 found)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1620 ;; 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
1621 ;; 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
1622 ;; bound arg, so skip the minibuffer prompt.
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1623 (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
1624 (goto-char (minibuffer-prompt-end)))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1625 (or
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1626 ;; 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
1627 (funcall search-fun string
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1628 (if isearch-forward bound (minibuffer-prompt-end))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1629 noerror)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1630 ;; 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
1631 ;; 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
1632 ;; 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
1633 ;; 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
1634 (unless bound
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1635 (condition-case nil
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1636 (progn
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1637 (while (not found)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1638 (cond (isearch-forward
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1639 (next-history-element 1)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1640 (goto-char (minibuffer-prompt-end)))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1641 (t
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1642 (previous-history-element 1)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1643 (goto-char (point-max))))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1644 (setq isearch-barrier (point) isearch-opoint (point))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1645 ;; 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
1646 ;; 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
1647 ;; 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
1648 ;; beginning/end of history.
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1649 (setq found (funcall search-fun string
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1650 (unless isearch-forward
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1651 ;; For backward search, don't search
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1652 ;; in the minibuffer prompt
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1653 (minibuffer-prompt-end))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1654 noerror)))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1655 ;; Return point of the new search result
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1656 (point))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1657 ;; 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
1658 (error nil)))))))))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1659
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1660 (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
1661 "Display the minibuffer history search prompt.
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1662 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
1663 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
1664 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
1665 `isearch-message'."
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1666 (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
1667 ;; 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
1668 ;; 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
1669 ;; 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
1670 ;; 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
1671 (isearch-message c-q-hack ellipsis)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1672 ;; 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
1673 ;; the initial minibuffer prompt.
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1674 (if (overlayp minibuffer-history-isearch-message-overlay)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1675 (move-overlay minibuffer-history-isearch-message-overlay
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1676 (point-min) (minibuffer-prompt-end))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1677 (setq minibuffer-history-isearch-message-overlay
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1678 (make-overlay (point-min) (minibuffer-prompt-end)))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1679 (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
1680 (overlay-put minibuffer-history-isearch-message-overlay
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1681 '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
1682 ;; And clear any previous isearch message.
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1683 (message "")))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1684
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1685 (defun minibuffer-history-isearch-wrap ()
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
1686 "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
1687 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
1688 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
1689 (unless isearch-word
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1690 ;; 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
1691 ;; 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
1692 ;; minibuffer history element.
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1693 (if isearch-forward
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1694 (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
1695 (goto-history-element 0))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1696 (setq isearch-success t))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1697 (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
1698
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1699 (defun minibuffer-history-isearch-push-state ()
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1700 "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
1701 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
1702 in the search status stack."
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1703 `(lambda (cmd)
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1704 (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
1705
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1706 (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
1707 "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
1708 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
1709 (goto-history-element hist-pos))
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1710
62d33d80e1db (goto-history-element): New function created from
Juri Linkov <juri@jurta.org>
parents: 81736
diff changeset
1711
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1712 ;Put this on C-x u, so we can force that rather than C-_ into startup msg
104922
c603ee2aac17 * keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104897
diff changeset
1713 (define-obsolete-function-alias 'advertised-undo 'undo "23.2")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1714
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1715 (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
1716 "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
1717 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
1718 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
1719
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1720 (defvar undo-in-region nil
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1721 "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
1722
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1723 (defvar undo-no-redo nil
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1724 "If t, `undo' doesn't go through redo entries.")
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1725
59782
ec7c04e04f71 (undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents: 59701
diff changeset
1726 (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
1727 "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
1728 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
1729
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1730 (defun undo (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1731 "Undo some previous changes.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1732 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
1733 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
1734
32899
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
1735 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
1736 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
1737 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
1738 (interactive "*P")
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1739 ;; 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
1740 ;; 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
1741 ;; 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
1742 ;; 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
1743 ;; 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
1744 ;; 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
1745 (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
1746 (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
1747 message)
54259
86345e064999 (undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents: 54058
diff changeset
1748 ;; 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
1749 ;; 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
1750 ;; 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
1751 (setq this-command 'undo-start)
86345e064999 (undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents: 54058
diff changeset
1752
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
1753 (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
1754 (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
1755 ;; 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
1756 ;; 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
1757 (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
1758 (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
1759 (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
1760 ;; 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
1761 ;; 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
1762 (gethash list undo-equiv-table))))
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1763 (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
1764 (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
1765 (if undo-in-region
32899
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
1766 (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
1767 (undo-start))
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
1768 ;; 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
1769 (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
1770 ;; 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
1771 (setq this-command 'undo)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1772 ;; 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
1773 ;; 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
1774 (let ((equiv (gethash pending-undo-list undo-equiv-table)))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1775 (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
1776 (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
1777 (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
1778 (if equiv "Redo!" "Undo!"))))
61531
34b31319dc9b (undo): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 61469
diff changeset
1779 (when (and (consp equiv) undo-no-redo)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1780 ;; 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
1781 ;; 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
1782 (while (let ((next (gethash equiv undo-equiv-table)))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1783 (if next (setq equiv next))))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1784 (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
1785 (undo-more
93561
e39e5bb86d6b (beginning-of-buffer, end-of-buffer, goto-line, undo)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93548
diff changeset
1786 (if (numberp arg)
32899
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
1787 (prefix-numeric-value arg)
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
1788 1))
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1789 ;; 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
1790 ;; 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
1791 ;; 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
1792 ;; record to the following undos.
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1793 ;; 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
1794 (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
1795 ;; 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
1796 ;; above when checking.
78bd54d14660 (undo): Don't loop when encountering empty undo records.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102467
diff changeset
1797 (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
1798 (setq list (cdr list)))
78bd54d14660 (undo): Don't loop when encountering empty undo records.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102467
diff changeset
1799 (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
1800 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
1801 ;; 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
1802 ;; 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
1803 (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
1804 (prev nil))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1805 (while (car tail)
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1806 (when (integerp (car tail))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1807 (let ((pos (car tail)))
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1808 (if prev
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1809 (setcdr prev (cdr tail))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1810 (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
1811 (setq tail (cdr tail))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1812 (while (car tail)
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1813 (if (eq pos (car tail))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1814 (if prev
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1815 (setcdr prev (cdr tail))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1816 (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
1817 (setq prev tail))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1818 (setq tail (cdr tail)))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1819 (setq tail nil)))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1820 (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
1821 ;; 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
1822 ;; so the next command can tell if the buffer was modified in between.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1823 (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
1824 (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
1825 ;; Display a message announcing success.
ef5c1ec14e1f (undo): Display message at end, not at start.
Richard M. Stallman <rms@gnu.org>
parents: 66405
diff changeset
1826 (if message
87096
a99a2e8bc21e Fix possibly buggy calls to `message'.
Deepak Goel <deego@gnufans.org>
parents: 86104
diff changeset
1827 (message "%s" message))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1828
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
1829 (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
1830 "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
1831 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
1832 (interactive)
59162
ced0821d5f7c (buffer-disable-undo): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 59157
diff changeset
1833 (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
1834 (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
1835
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1836 (defun undo-only (&optional arg)
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1837 "Undo some previous changes.
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1838 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
1839 A numeric ARG serves as a repeat count.
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1840 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
1841 (interactive "*p")
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1842 (let ((undo-no-redo t)) (undo arg)))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1843
22725
6d0f7798f157 (undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22375
diff changeset
1844 (defvar undo-in-progress nil
6d0f7798f157 (undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22375
diff changeset
1845 "Non-nil while performing an undo.
6d0f7798f157 (undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22375
diff changeset
1846 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
1847
63487
eb15f8c9bc85 (undo-more): Don't use `format' on `error' arguments. Improve
Juanma Barranquero <lekktu@gmail.com>
parents: 63485
diff changeset
1848 (defun undo-more (n)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1849 "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
1850 Call `undo-start' to get ready to undo recent changes,
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1851 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
1852 (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
1853 (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
1854 (and undo-in-region " for region"))))
22725
6d0f7798f157 (undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22375
diff changeset
1855 (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
1856 ;; 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
1857 ;; `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
1858 ;; 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
1859 (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
1860 (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
1861 (setq pending-undo-list t))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1862
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1863 ;; Deep copy of a list
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1864 (defun undo-copy-list (list)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1865 "Make a copy of undo list LIST."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1866 (mapcar 'undo-copy-list-1 list))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1867
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1868 (defun undo-copy-list-1 (elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1869 (if (consp elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1870 (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
1871 elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1872
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1873 (defun undo-start (&optional beg end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1874 "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
1875 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
1876 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
1877 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
1878 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
1879 (if (eq buffer-undo-list t)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1880 (error "No undo information in this buffer"))
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1881 (setq pending-undo-list
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1882 (if (and beg end (not (= beg end)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1883 (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
1884 buffer-undo-list)))
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 (defvar undo-adjusted-markers)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1887
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1888 (defun undo-make-selective-list (start end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1889 "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
1890 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
1891 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
1892 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
1893 we stop and ignore all further elements."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1894 (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
1895 (undo-list (list nil))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1896 undo-adjusted-markers
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1897 some-rejected
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1898 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
1899 (while undo-list-copy
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1900 (setq undo-elt (car undo-list-copy))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1901 (let ((keep-this
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1902 (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
1903 ;; This is a "was unmodified" element.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1904 ;; 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
1905 (not some-rejected))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1906 (t
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1907 (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
1908 (if keep-this
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1909 (progn
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1910 (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
1911 ;; 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
1912 (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
1913 (eq undo-elt nil)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1914 (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
1915 (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
1916 (setq undo-list-copy nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1917 (setq some-rejected t)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1918 (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
1919 (setq delta (undo-delta undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1920
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1921 (when (/= (cdr delta) 0)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1922 (let ((position (car delta))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1923 (offset (cdr delta)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1924
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1925 ;; 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
1926 ;; 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
1927 ;; 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
1928 ;; 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
1929 ;; 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
1930 ;; output
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1931
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1932 (while temp-undo-list
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1933 (setq undo-elt (car temp-undo-list))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1934 (cond ((integerp undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1935 (if (>= undo-elt position)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1936 (setcar temp-undo-list (- undo-elt offset))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1937 ((atom undo-elt) nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1938 ((stringp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1939 ;; (TEXT . POSITION)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1940 (let ((text-pos (abs (cdr undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1941 (point-at-end (< (cdr undo-elt) 0 )))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1942 (if (>= text-pos position)
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1943 (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
1944 (- text-pos offset))))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1945 ((integerp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1946 ;; (BEGIN . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1947 (when (>= (car undo-elt) position)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1948 (setcar undo-elt (- (car undo-elt) offset))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1949 (setcdr undo-elt (- (cdr undo-elt) offset))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1950 ((null (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1951 ;; (nil PROPERTY VALUE BEG . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1952 (let ((tail (nthcdr 3 undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1953 (when (>= (car tail) position)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1954 (setcar tail (- (car tail) offset))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1955 (setcdr tail (- (cdr tail) offset))))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1956 (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
1957 (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
1958 (nreverse undo-list)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1959
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1960 (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
1961 "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
1962 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
1963 (cond ((integerp undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1964 (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
1965 (<= undo-elt end)))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1966 ((eq undo-elt nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1967 t)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1968 ((atom undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1969 nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1970 ((stringp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1971 ;; (TEXT . POSITION)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1972 (and (>= (abs (cdr undo-elt)) start)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1973 (< (abs (cdr undo-elt)) end)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1974 ((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
1975 ;; 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
1976 ;; See if MARKER is inside the region.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1977 (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
1978 (unless alist-elt
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1979 (setq alist-elt (cons (car undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1980 (marker-position (car undo-elt))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1981 (setq undo-adjusted-markers
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1982 (cons alist-elt undo-adjusted-markers)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1983 (and (cdr alist-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1984 (>= (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
1985 (<= (cdr alist-elt) end))))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1986 ((null (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1987 ;; (nil PROPERTY VALUE BEG . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1988 (let ((tail (nthcdr 3 undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1989 (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
1990 (<= (cdr tail) end))))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1991 ((integerp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1992 ;; (BEGIN . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1993 (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
1994 (<= (cdr undo-elt) end)))))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1995
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1996 (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
1997 "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
1998 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
1999 is not *inside* the region START...END."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2000 (cond ((atom undo-elt) nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2001 ((null (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2002 ;; (nil PROPERTY VALUE BEG . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2003 (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
2004 (and (< (car tail) end)
4a27744452bb (undo-elt-crosses-region): Fix the inequalities.
Richard M. Stallman <rms@gnu.org>
parents: 73190
diff changeset
2005 (> (cdr tail) start))))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2006 ((integerp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2007 ;; (BEGIN . END)
73209
4a27744452bb (undo-elt-crosses-region): Fix the inequalities.
Richard M. Stallman <rms@gnu.org>
parents: 73190
diff changeset
2008 (and (< (car undo-elt) end)
4a27744452bb (undo-elt-crosses-region): Fix the inequalities.
Richard M. Stallman <rms@gnu.org>
parents: 73190
diff changeset
2009 (> (cdr undo-elt) start)))))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2010
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2011 ;; 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
2012 ;; 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
2013 ;; the undo.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2014 (defun undo-delta (undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2015 (if (consp undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2016 (cond ((stringp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2017 ;; (TEXT . POSITION)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2018 (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
2019 ((integerp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2020 ;; (BEGIN . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2021 (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
2022 (t
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2023 '(0 . 0)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
2024 '(0 . 0)))
59055
f6e8a2dc456a (undo-outer-limit-truncate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 58961
diff changeset
2025
71793
205070e11ae3 * simple.el (undo-ask-before-discard): Set to nil.
Chong Yidong <cyd@stupidchicken.com>
parents: 71625
diff changeset
2026 (defcustom undo-ask-before-discard nil
59790
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2027 "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
2028 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
2029 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
2030 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
2031 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
2032 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
2033
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2034 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
2035 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
2036 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
2037 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
2038 excessively long before answering the question."
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2039 :type 'boolean
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2040 :group 'undo
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59790
diff changeset
2041 :version "22.1")
59790
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2042
59178
abe8f4f2982c (mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents: 59162
diff changeset
2043 (defvar undo-extra-outer-limit nil
abe8f4f2982c (mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents: 59162
diff changeset
2044 "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
2045 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
2046 current item gets bigger than this amount.
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2047
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2048 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
2049 (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
2050
59790
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2051 ;; 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
2052 ;; 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
2053 ;; 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
2054 ;; 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
2055 ;; lot of consing.
59055
f6e8a2dc456a (undo-outer-limit-truncate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 58961
diff changeset
2056 (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
2057 (defun undo-outer-limit-truncate (size)
59790
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2058 (if undo-ask-before-discard
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2059 (when (or (null undo-extra-outer-limit)
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2060 (> size undo-extra-outer-limit))
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2061 ;; 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
2062 ;; 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
2063 ;; 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
2064 ;; again momentarily. It will call this function again,
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2065 ;; 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
2066 (setq undo-extra-outer-limit (+ size 50000))
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2067 (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
2068 (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
2069 (buffer-name) size)))
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2070 (progn (setq buffer-undo-list nil)
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2071 (setq undo-extra-outer-limit nil)
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2072 t)
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2073 nil))
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2074 (display-warning '(undo discard-info)
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2075 (concat
70325
c8e4a9156d18 (undo-outer-limit-truncate): Put quotes around buffer name in messages.
Richard M. Stallman <rms@gnu.org>
parents: 69899
diff changeset
2076 (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
2077 (buffer-name) size)
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2078 "The undo info was discarded because it exceeded \
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2079 `undo-outer-limit'.
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2080
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2081 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
2082 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
2083 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
2084 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
2085 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
2086 maximum memory allotted to Emacs.
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2087
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2088 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
2089 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
2090
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2091 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
2092 \(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
2093 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
2094 :warning)
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2095 (setq buffer-undo-list nil)
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
2096 t))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
2097
4374
1a64d641cea4 (shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4289
diff changeset
2098 (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
2099 "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
2100
d5c0ef4db45d (minibuffer-history, shell-command-history): Add references to history-length
Eli Zaretskii <eliz@gnu.org>
parents: 79325
diff changeset
2101 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
2102 of `history-length', which see.")
4374
1a64d641cea4 (shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4289
diff changeset
2103
105965
3f64b8380468 * textmodes/ispell.el (ispell-skip-region-alist):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105939
diff changeset
2104 (defvar shell-command-switch (purecopy "-c")
9779
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
2105 "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
2106
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2107 (defvar shell-command-default-error-buffer nil
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2108 "*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
2109 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
2110 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
2111 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
2112
94251
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2113 (declare-function mailcap-file-default-commands "mailcap" (files))
105938
788a43a6e3c8 (dired-get-filename)<declare-function>:
Juri Linkov <juri@jurta.org>
parents: 105798
diff changeset
2114 (declare-function dired-get-filename "dired" (&optional localp no-error-if-not-filep))
94251
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2115
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2116 (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
2117 "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
2118 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
2119 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
2120 (interactive)
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2121 (let* ((filename (if (listp minibuffer-default)
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2122 (car minibuffer-default)
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2123 minibuffer-default))
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2124 (commands (and filename (require 'mailcap nil t)
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2125 (mailcap-file-default-commands (list filename)))))
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2126 (setq commands (mapcar (lambda (command)
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2127 (concat command " " filename))
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2128 commands))
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2129 (if (listp minibuffer-default)
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2130 (append minibuffer-default commands)
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2131 (cons minibuffer-default commands))))
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2132
98670
d87ee665546a (shell-delimiter-argument-list, shell-file-name-chars)
Glenn Morris <rgm@gnu.org>
parents: 98609
diff changeset
2133 (defvar shell-delimiter-argument-list)
d87ee665546a (shell-delimiter-argument-list, shell-file-name-chars)
Glenn Morris <rgm@gnu.org>
parents: 98609
diff changeset
2134 (defvar shell-file-name-chars)
d87ee665546a (shell-delimiter-argument-list, shell-file-name-chars)
Glenn Morris <rgm@gnu.org>
parents: 98609
diff changeset
2135 (defvar shell-file-name-quote-list)
d87ee665546a (shell-delimiter-argument-list, shell-file-name-chars)
Glenn Morris <rgm@gnu.org>
parents: 98609
diff changeset
2136
93112
6ed43e8a395c (minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93011
diff changeset
2137 (defun minibuffer-complete-shell-command ()
6ed43e8a395c (minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93011
diff changeset
2138 "Dynamically complete shell command at point."
6ed43e8a395c (minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93011
diff changeset
2139 (interactive)
6ed43e8a395c (minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93011
diff changeset
2140 (require 'shell)
98609
ca935ec23969 (minibuffer-complete-shell-command): Bind
Andreas Schwab <schwab@suse.de>
parents: 97481
diff changeset
2141 (let ((comint-delimiter-argument-list shell-delimiter-argument-list)
ca935ec23969 (minibuffer-complete-shell-command): Bind
Andreas Schwab <schwab@suse.de>
parents: 97481
diff changeset
2142 (comint-file-name-chars shell-file-name-chars)
ca935ec23969 (minibuffer-complete-shell-command): Bind
Andreas Schwab <schwab@suse.de>
parents: 97481
diff changeset
2143 (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
2144 (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
2145
6ed43e8a395c (minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93011
diff changeset
2146 (defvar minibuffer-local-shell-command-map
6ed43e8a395c (minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93011
diff changeset
2147 (let ((map (make-sparse-keymap)))
6ed43e8a395c (minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93011
diff changeset
2148 (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
2149 (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
2150 map)
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
2151 "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
2152
6ed43e8a395c (minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93011
diff changeset
2153 (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
2154 "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
2155 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
2156 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
2157 to `shell-command-history'."
97150
9718b5cb3616 (read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents: 97128
diff changeset
2158 (minibuffer-with-setup-hook
9718b5cb3616 (read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents: 97128
diff changeset
2159 (lambda ()
9718b5cb3616 (read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents: 97128
diff changeset
2160 (set (make-local-variable 'minibuffer-default-add-function)
9718b5cb3616 (read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents: 97128
diff changeset
2161 'minibuffer-default-add-shell-commands))
9718b5cb3616 (read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents: 97128
diff changeset
2162 (apply 'read-from-minibuffer prompt initial-contents
9718b5cb3616 (read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents: 97128
diff changeset
2163 minibuffer-local-shell-command-map
9718b5cb3616 (read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents: 97128
diff changeset
2164 nil
9718b5cb3616 (read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents: 97128
diff changeset
2165 (or hist 'shell-command-history)
9718b5cb3616 (read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents: 97128
diff changeset
2166 args)))
93112
6ed43e8a395c (minibuffer-local-shell-command-map): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93011
diff changeset
2167
103694
695df25d3fc1 (async-shell-command): New command.
Juri Linkov <juri@jurta.org>
parents: 103417
diff changeset
2168 (defun async-shell-command (command &optional output-buffer error-buffer)
695df25d3fc1 (async-shell-command): New command.
Juri Linkov <juri@jurta.org>
parents: 103417
diff changeset
2169 "Execute string COMMAND asynchronously in background.
695df25d3fc1 (async-shell-command): New command.
Juri Linkov <juri@jurta.org>
parents: 103417
diff changeset
2170
695df25d3fc1 (async-shell-command): New command.
Juri Linkov <juri@jurta.org>
parents: 103417
diff changeset
2171 Like `shell-command' but if COMMAND doesn't end in ampersand, adds `&'
695df25d3fc1 (async-shell-command): New command.
Juri Linkov <juri@jurta.org>
parents: 103417
diff changeset
2172 surrounded by whitespace and executes the command asynchronously.
108632
d38b0dd2bdbe Provide a simple generic indentation engine and use it for Prolog.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108574
diff changeset
2173 The output appears in the buffer `*Async Shell Command*'.
d38b0dd2bdbe Provide a simple generic indentation engine and use it for Prolog.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108574
diff changeset
2174
d38b0dd2bdbe Provide a simple generic indentation engine and use it for Prolog.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108574
diff changeset
2175 In Elisp, you will often be better served by calling `start-process'
d38b0dd2bdbe Provide a simple generic indentation engine and use it for Prolog.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108574
diff changeset
2176 directly, since it offers more control and does not impose the use of a
d38b0dd2bdbe Provide a simple generic indentation engine and use it for Prolog.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108574
diff changeset
2177 shell (with its need to quote arguments)."
103694
695df25d3fc1 (async-shell-command): New command.
Juri Linkov <juri@jurta.org>
parents: 103417
diff changeset
2178 (interactive
695df25d3fc1 (async-shell-command): New command.
Juri Linkov <juri@jurta.org>
parents: 103417
diff changeset
2179 (list
695df25d3fc1 (async-shell-command): New command.
Juri Linkov <juri@jurta.org>
parents: 103417
diff changeset
2180 (read-shell-command "Async shell command: " nil nil
695df25d3fc1 (async-shell-command): New command.
Juri Linkov <juri@jurta.org>
parents: 103417
diff changeset
2181 (and buffer-file-name
695df25d3fc1 (async-shell-command): New command.
Juri Linkov <juri@jurta.org>
parents: 103417
diff changeset
2182 (file-relative-name buffer-file-name)))
695df25d3fc1 (async-shell-command): New command.
Juri Linkov <juri@jurta.org>
parents: 103417
diff changeset
2183 current-prefix-arg
695df25d3fc1 (async-shell-command): New command.
Juri Linkov <juri@jurta.org>
parents: 103417
diff changeset
2184 shell-command-default-error-buffer))
695df25d3fc1 (async-shell-command): New command.
Juri Linkov <juri@jurta.org>
parents: 103417
diff changeset
2185 (unless (string-match "&[ \t]*\\'" command)
695df25d3fc1 (async-shell-command): New command.
Juri Linkov <juri@jurta.org>
parents: 103417
diff changeset
2186 (setq command (concat command " &")))
695df25d3fc1 (async-shell-command): New command.
Juri Linkov <juri@jurta.org>
parents: 103417
diff changeset
2187 (shell-command command output-buffer error-buffer))
695df25d3fc1 (async-shell-command): New command.
Juri Linkov <juri@jurta.org>
parents: 103417
diff changeset
2188
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2189 (defun shell-command (command &optional output-buffer error-buffer)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2190 "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
2191 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
2192
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2193 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
2194 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
2195 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
2196
33312
1e1d6d077288 (shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents: 32899
diff changeset
2197 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
2198 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
2199 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
2200 `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
2201 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
2202 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
2203
19109
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
2204 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
2205 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
2206 before this command.
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
2207
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
2208 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
2209 `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
2210
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
2211 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
2212 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
2213 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
2214 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
2215 insert output in current buffer. (This cannot be done asynchronously.)
106011
37fee35a6283 * simple.el (shell-command): Doc fix (Bug#4891).
Chong Yidong <cyd@stupidchicken.com>
parents: 106003
diff changeset
2216 In either case, the buffer is first erased, and the output is
37fee35a6283 * simple.el (shell-command): Doc fix (Bug#4891).
Chong Yidong <cyd@stupidchicken.com>
parents: 106003
diff changeset
2217 inserted after point (leaving mark after it).
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2218
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
2219 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
2220 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
2221 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
2222 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
2223 \(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
2224 `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
2225 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
2226
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
2227 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
2228 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
2229 of the output.
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
2230
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
2231 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
2232 then `*Shell Command Output*' is deleted.
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
2233
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2234 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
2235 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
2236 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
2237 In an interactive call, the variable `shell-command-default-error-buffer'
108632
d38b0dd2bdbe Provide a simple generic indentation engine and use it for Prolog.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108574
diff changeset
2238 specifies the value of ERROR-BUFFER.
d38b0dd2bdbe Provide a simple generic indentation engine and use it for Prolog.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108574
diff changeset
2239
d38b0dd2bdbe Provide a simple generic indentation engine and use it for Prolog.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108574
diff changeset
2240 In Elisp, you will often be better served by calling `call-process' or
d38b0dd2bdbe Provide a simple generic indentation engine and use it for Prolog.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108574
diff changeset
2241 `start-process' directly, since it offers more control and does not impose
d38b0dd2bdbe Provide a simple generic indentation engine and use it for Prolog.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108574
diff changeset
2242 the use of a shell (with its need to quote arguments)."
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2243
94251
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2244 (interactive
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2245 (list
97150
9718b5cb3616 (read-shell-command, shell-command):
Juri Linkov <juri@jurta.org>
parents: 97128
diff changeset
2246 (read-shell-command "Shell command: " nil nil
105938
788a43a6e3c8 (dired-get-filename)<declare-function>:
Juri Linkov <juri@jurta.org>
parents: 105798
diff changeset
2247 (let ((filename
788a43a6e3c8 (dired-get-filename)<declare-function>:
Juri Linkov <juri@jurta.org>
parents: 105798
diff changeset
2248 (cond
788a43a6e3c8 (dired-get-filename)<declare-function>:
Juri Linkov <juri@jurta.org>
parents: 105798
diff changeset
2249 (buffer-file-name)
788a43a6e3c8 (dired-get-filename)<declare-function>:
Juri Linkov <juri@jurta.org>
parents: 105798
diff changeset
2250 ((eq major-mode 'dired-mode)
788a43a6e3c8 (dired-get-filename)<declare-function>:
Juri Linkov <juri@jurta.org>
parents: 105798
diff changeset
2251 (dired-get-filename nil t)))))
788a43a6e3c8 (dired-get-filename)<declare-function>:
Juri Linkov <juri@jurta.org>
parents: 105798
diff changeset
2252 (and filename (file-relative-name filename))))
94251
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2253 current-prefix-arg
5e8b311c9c8e (minibuffer-default-add-shell-commands): New function.
Juri Linkov <juri@jurta.org>
parents: 94215
diff changeset
2254 shell-command-default-error-buffer))
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2255 ;; 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
2256 (let ((handler
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2257 (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
2258 'shell-command)))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2259 (if handler
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2260 (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
2261 (if (and output-buffer
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2262 (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
2263 ;; Output goes in current buffer.
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2264 (let ((error-file
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2265 (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
2266 (make-temp-file
25483
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
2267 (expand-file-name "scor"
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
2268 (or small-temporary-file-directory
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
2269 temporary-file-directory)))
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2270 nil)))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2271 (barf-if-buffer-read-only)
24825
f88179cfae99 (shell-command): Avoid printing "mark set" message.
Karl Heuer <kwzh@gnu.org>
parents: 24814
diff changeset
2272 (push-mark nil t)
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2273 ;; 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
2274 ;; .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
2275 ;; "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
2276 ;; 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
2277 ;; 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
2278 (call-process shell-file-name nil
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2279 (if error-file
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2280 (list t error-file)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2281 t)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2282 nil shell-command-switch command)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2283 (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
2284 (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
2285 (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
2286 (let ((pos-from-end (- (point-max) (point))))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2287 (or (bobp)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2288 (insert "\f\n"))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2289 ;; Do no formatting while reading error file,
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2290 ;; 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
2291 ;; 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
2292 (format-insert-file error-file nil)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2293 ;; Put point after the inserted errors.
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2294 (goto-char (- (point-max) pos-from-end)))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2295 (display-buffer (current-buffer))))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2296 (delete-file error-file))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2297 ;; 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
2298 ;; 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
2299 ;; 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
2300 ;; because we inserted text.
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2301 (goto-char (prog1 (mark t)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2302 (set-marker (mark-marker) (point)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2303 (current-buffer)))))
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
2304 ;; Output goes in a separate buffer.
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2305 ;; 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
2306 (save-match-data
46026
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
2307 (if (string-match "[ \t]*&[ \t]*\\'" command)
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2308 ;; Command ending with ampersand means asynchronous.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2309 (let ((buffer (get-buffer-create
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2310 (or output-buffer "*Async Shell Command*")))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2311 (directory default-directory)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2312 proc)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2313 ;; Remove the ampersand.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2314 (setq command (substring command 0 (match-beginning 0)))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2315 ;; If will kill a process, query first.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2316 (setq proc (get-buffer-process buffer))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2317 (if proc
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2318 (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
2319 (kill-process proc)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2320 (error "Shell command in progress")))
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
2321 (with-current-buffer buffer
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2322 (setq buffer-read-only nil)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2323 (erase-buffer)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2324 (display-buffer buffer)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2325 (setq default-directory directory)
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2326 (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
2327 shell-command-switch command))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2328 (setq mode-line-process '(":%s"))
51026
8113316012c6 (shell-command): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50987
diff changeset
2329 (require 'shell) (shell-mode)
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2330 (set-process-sentinel proc 'shell-command-sentinel)
104897
d7e64be6966a (shell-command): Set asynchronous process filter to
Juri Linkov <juri@jurta.org>
parents: 104664
diff changeset
2331 ;; Use the comint filter for proper handling of carriage motion
d7e64be6966a (shell-command): Set asynchronous process filter to
Juri Linkov <juri@jurta.org>
parents: 104664
diff changeset
2332 ;; (see `comint-inhibit-carriage-motion'),.
d7e64be6966a (shell-command): Set asynchronous process filter to
Juri Linkov <juri@jurta.org>
parents: 104664
diff changeset
2333 (set-process-filter proc 'comint-output-filter)
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
2334 ))
104897
d7e64be6966a (shell-command): Set asynchronous process filter to
Juri Linkov <juri@jurta.org>
parents: 104664
diff changeset
2335 ;; Otherwise, command is executed synchronously.
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2336 (shell-command-on-region (point) (point) command
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2337 output-buffer nil error-buffer)))))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
2338
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2339 (defun display-message-or-buffer (message
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2340 &optional buffer-name not-this-window frame)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2341 "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
2342 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
2343
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2344 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
2345 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
2346 if `resize-mini-windows' is non-nil.
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2347
32260
b3df18daadfb Doc fix.
Miles Bader <miles@gnu.org>
parents: 32222
diff changeset
2348 Returns either the string shown in the echo area, or when a pop-up
b3df18daadfb Doc fix.
Miles Bader <miles@gnu.org>
parents: 32222
diff changeset
2349 buffer is used, the window used to display it.
b3df18daadfb Doc fix.
Miles Bader <miles@gnu.org>
parents: 32222
diff changeset
2350
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2351 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
2352 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
2353 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
2354 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
2355 the contents are inserted into the buffer anyway.
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2356
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2357 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
2358 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
2359 (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
2360 ;; 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
2361 (message "%s" message))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2362 ((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
2363 (= (string-match "\n" message) (1- (length message))))
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2364 ;; 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
2365 (message "%s" (substring message 0 (1- (length message)))))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2366 (t
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2367 ;; General case
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2368 (with-current-buffer
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2369 (if (bufferp message)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2370 message
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2371 (get-buffer-create (or buffer-name "*Message*")))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2372
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2373 (unless (bufferp message)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2374 (erase-buffer)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2375 (insert message))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2376
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2377 (let ((lines
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2378 (if (= (buffer-size) 0)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2379 0
68611
28a6ea706763 (display-message-or-buffer): Count screen lines instead of buffer lines when
Eli Zaretskii <eliz@gnu.org>
parents: 68537
diff changeset
2380 (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
2381 (cond ((= lines 0))
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
2382 ((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
2383 (<= lines
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
2384 (if resize-mini-windows
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
2385 (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
2386 (* (frame-height)
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
2387 max-mini-window-height))
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
2388 ((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
2389 max-mini-window-height)
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
2390 (t
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
2391 1))
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
2392 1)))
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
2393 ;; 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
2394 ;; already dispayed in the selected frame.
46090
f52b57f5e2a4 (display-message-or-buffer): Fix last change.
Andreas Schwab <schwab@suse.de>
parents: 46088
diff changeset
2395 (not (get-buffer-window (current-buffer))))
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2396 ;; Echo area
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2397 (goto-char (point-max))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2398 (when (bolp)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2399 (backward-char 1))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2400 (message "%s" (buffer-substring (point-min) (point))))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2401 (t
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2402 ;; Buffer
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2403 (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
2404 (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
2405 not-this-window frame))))))))
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2406
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2407
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2408 ;; We have a sentinel to prevent insertion of a termination message
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2409 ;; in the buffer itself.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2410 (defun shell-command-sentinel (process signal)
12565
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
2411 (if (memq (process-status process) '(exit signal))
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2412 (message "%s: %s."
12565
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
2413 (car (cdr (cdr (process-command process))))
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
2414 (substring signal 0 -1))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2415
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
2416 (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
2417 &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
2418 error-buffer display-error-buffer)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2419 "Execute string COMMAND in inferior shell with region as input.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2420 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
2421 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
2422 COMMAND.
10852
55552df3bd18 (shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10813
diff changeset
2423
19109
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
2424 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
2425 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
2426 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
2427 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
2428 `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
2429 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
2430
56761
486136b7f89c (shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents: 56613
diff changeset
2431 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
2432 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
2433 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
2434 `coding-system-for-read' and `coding-system-for-write'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2435
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
2436 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
2437 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
2438 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
2439 \(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
2440 `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
2441 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
2442 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
2443
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
2444 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
2445 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
2446
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
2447 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
2448 then `*Shell Command Output*' is deleted.
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
2449
10852
55552df3bd18 (shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10813
diff changeset
2450 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
2451 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
2452 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
2453 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
2454 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
2455 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
2456
23471
b6dbbd2cc3ac (shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23450
diff changeset
2457 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
2458 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
2459 around it.
b6dbbd2cc3ac (shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23450
diff changeset
2460
23588
cec6b3f8f355 (shell-command-on-region): Doc fix.
Andreas Schwab <schwab@suse.de>
parents: 23520
diff changeset
2461 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
2462 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
2463 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
2464 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
2465 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
2466 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
2467 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
2468 (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
2469 (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
2470 (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
2471 ;; 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
2472 ;; 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
2473 ;; 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
2474 (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
2475 ;; call-interactively recognizes region-beginning and
e49cd471ced7 (do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13328
diff changeset
2476 ;; 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
2477 (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
2478 string
7b7874738e7c (shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents: 10779
diff changeset
2479 current-prefix-arg
24106
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
2480 current-prefix-arg
56761
486136b7f89c (shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents: 56613
diff changeset
2481 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
2482 t)))
19362
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
2483 (let ((error-file
25483
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
2484 (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
2485 (make-temp-file
25483
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
2486 (expand-file-name "scor"
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
2487 (or small-temporary-file-directory
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
2488 temporary-file-directory)))
24155
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
2489 nil))
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
2490 exit-status)
24106
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
2491 (if (or replace
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
2492 (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
2493 (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
2494 ;; 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
2495 (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
2496 ;; 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
2497 (goto-char start)
43794
8acd1399d389 (shell-command-on-region): Call push-mark with
Eli Zaretskii <eliz@gnu.org>
parents: 43581
diff changeset
2498 (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
2499 (setq exit-status
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
2500 (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
2501 (if error-file
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
2502 (list t error-file)
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
2503 t)
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
2504 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
2505 ;; 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
2506 ;; (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
2507 ;; (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
2508 ;; (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
2509 ;; 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
2510 (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
2511 ;; 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
2512 ;; replacing its entire contents.
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
2513 (let ((buffer (get-buffer-create
46088
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2514 (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
2515 (unwind-protect
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
2516 (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
2517 ;; 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
2518 ;; 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
2519 ;; 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
2520 (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
2521 (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
2522 (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
2523 (setq exit-status
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
2524 (call-process-region (point-min) (point-max)
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2525 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
2526 (if error-file
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
2527 (list t error-file)
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
2528 t)
24155
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
2529 nil shell-command-switch
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
2530 command)))
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
2531 ;; 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
2532 ;; output there.
28703
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
2533 (let ((directory default-directory))
105994
009383a57ce8 * x-dnd.el (x-dnd-maybe-call-test-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105985
diff changeset
2534 (with-current-buffer buffer
28703
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
2535 (setq buffer-read-only nil)
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
2536 (if (not output-buffer)
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
2537 (setq default-directory directory))
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
2538 (erase-buffer)))
24106
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
2539 (setq exit-status
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
2540 (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
2541 (if error-file
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
2542 (list buffer error-file)
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
2543 buffer)
24155
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
2544 nil shell-command-switch command)))
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
2545 ;; Report the output.
43581
d7536b0977ac (shell-command-on-region): Report non-zero exit
Kim F. Storm <storm@cua.dk>
parents: 43436
diff changeset
2546 (with-current-buffer buffer
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
2547 (setq mode-line-process
46088
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2548 (cond ((null exit-status)
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2549 " - Error")
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2550 ((stringp exit-status)
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2551 (format " - Signal [%s]" exit-status))
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2552 ((not (equal 0 exit-status))
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2553 (format " - Exit [%d]" exit-status)))))
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2554 (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
2555 ;; 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
2556 (display-message-or-buffer buffer)
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2557 ;; 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
2558 (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
2559 (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
2560 (< 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
2561 "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
2562 "no output")))
46088
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2563 (cond ((null exit-status)
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2564 (message "(Shell command failed with error)"))
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2565 ((equal 0 exit-status)
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2566 (message "(Shell command succeeded with %s)"
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2567 output))
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2568 ((stringp exit-status)
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2569 (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
2570 exit-status))
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2571 (t
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2572 (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
2573 exit-status output))))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
2574 ;; 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
2575 ;; (kill-buffer buffer)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
2576 ))))
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2577
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2578 (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
2579 (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
2580 (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
2581 (let ((pos-from-end (- (point-max) (point))))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2582 (or (bobp)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2583 (insert "\f\n"))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2584 ;; Do no formatting while reading error file,
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2585 ;; 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
2586 ;; 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
2587 (format-insert-file error-file nil)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2588 ;; Put point after the inserted errors.
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2589 (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
2590 (and display-error-buffer
486136b7f89c (shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents: 56613
diff changeset
2591 (display-buffer (current-buffer)))))
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2592 (delete-file error-file))
24155
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
2593 exit-status))
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2594
16312
20690a1ec100 (shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16018
diff changeset
2595 (defun shell-command-to-string (command)
20690a1ec100 (shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16018
diff changeset
2596 "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
2597 (with-output-to-string
16316
50be5f6cb5e6 (shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents: 16312
diff changeset
2598 (with-current-buffer
50be5f6cb5e6 (shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents: 16312
diff changeset
2599 standard-output
50be5f6cb5e6 (shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents: 16312
diff changeset
2600 (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
2601
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57146
diff changeset
2602 (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
2603 "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
2604 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
2605 `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
2606 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
2607
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57146
diff changeset
2608 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
2609 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
2610 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
2611 `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
2612 and BUFFER.\)
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57146
diff changeset
2613
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57146
diff changeset
2614 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
2615 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
2616 value passed."
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57146
diff changeset
2617 (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
2618 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
2619 (unwind-protect
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57146
diff changeset
2620 (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
2621 (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
2622 (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
2623 (make-temp-file "emacs")))
4d4bfb9781e1 (process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57668
diff changeset
2624 (prog1
4d4bfb9781e1 (process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57668
diff changeset
2625 (apply 'call-process program
4d4bfb9781e1 (process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57668
diff changeset
2626 (or lc infile)
4d4bfb9781e1 (process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57668
diff changeset
2627 (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
2628 display args)
4d4bfb9781e1 (process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57668
diff changeset
2629 (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
2630 (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
2631 (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
2632
104592
2e9b68642e06 * simple.el (process-file-side-effects): New defvar.
Michael Albinus <michael.albinus@gmx.de>
parents: 104345
diff changeset
2633 (defvar process-file-side-effects t
2e9b68642e06 * simple.el (process-file-side-effects): New defvar.
Michael Albinus <michael.albinus@gmx.de>
parents: 104345
diff changeset
2634 "Whether a call of `process-file' changes remote files.
2e9b68642e06 * simple.el (process-file-side-effects): New defvar.
Michael Albinus <michael.albinus@gmx.de>
parents: 104345
diff changeset
2635
2e9b68642e06 * simple.el (process-file-side-effects): New defvar.
Michael Albinus <michael.albinus@gmx.de>
parents: 104345
diff changeset
2636 Per default, this variable is always set to `t', meaning that a
2e9b68642e06 * simple.el (process-file-side-effects): New defvar.
Michael Albinus <michael.albinus@gmx.de>
parents: 104345
diff changeset
2637 call of `process-file' could potentially change any file on a
2e9b68642e06 * simple.el (process-file-side-effects): New defvar.
Michael Albinus <michael.albinus@gmx.de>
parents: 104345
diff changeset
2638 remote host. When set to `nil', a file handler could optimize
2e9b68642e06 * simple.el (process-file-side-effects): New defvar.
Michael Albinus <michael.albinus@gmx.de>
parents: 104345
diff changeset
2639 its behaviour with respect to remote file attributes caching.
2e9b68642e06 * simple.el (process-file-side-effects): New defvar.
Michael Albinus <michael.albinus@gmx.de>
parents: 104345
diff changeset
2640
2e9b68642e06 * simple.el (process-file-side-effects): New defvar.
Michael Albinus <michael.albinus@gmx.de>
parents: 104345
diff changeset
2641 This variable should never be changed by `setq'. Instead of, it
2e9b68642e06 * simple.el (process-file-side-effects): New defvar.
Michael Albinus <michael.albinus@gmx.de>
parents: 104345
diff changeset
2642 shall be set only by let-binding.")
2e9b68642e06 * simple.el (process-file-side-effects): New defvar.
Michael Albinus <michael.albinus@gmx.de>
parents: 104345
diff changeset
2643
81736
d50de52ebdfb * simple.el (start-file-process): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 81666
diff changeset
2644 (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
2645 "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
2646
81736
d50de52ebdfb * simple.el (start-file-process): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 81666
diff changeset
2647 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
2648 `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
2649
8b60ad9b42c3 * simple.el (start-file-process): Clarify docstring.
Michael Albinus <michael.albinus@gmx.de>
parents: 94678
diff changeset
2650 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
2651 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
2652 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
2653 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
2654
d50de52ebdfb * simple.el (start-file-process): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 81666
diff changeset
2655 PROGRAM and PROGRAM-ARGS might be file names. They are not
105384
724dd25f06a9 * simple.el (start-file-process): Say in the doc-string, that file
Michael Albinus <michael.albinus@gmx.de>
parents: 105372
diff changeset
2656 objects of file handler invocation. File handlers might not
724dd25f06a9 * simple.el (start-file-process): Say in the doc-string, that file
Michael Albinus <michael.albinus@gmx.de>
parents: 105372
diff changeset
2657 support pty association, if PROGRAM is nil."
81736
d50de52ebdfb * simple.el (start-file-process): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 81666
diff changeset
2658 (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
2659 (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
2660 (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
2661
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
2662
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2663 (defvar universal-argument-map
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2664 (let ((map (make-sparse-keymap)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2665 (define-key map [t] 'universal-argument-other-key)
12313
eca218b0a8ca (negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents: 12266
diff changeset
2666 (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
2667 (define-key map [switch-frame] nil)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2668 (define-key map [?\C-u] 'universal-argument-more)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2669 (define-key map [?-] 'universal-argument-minus)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2670 (define-key map [?0] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2671 (define-key map [?1] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2672 (define-key map [?2] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2673 (define-key map [?3] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2674 (define-key map [?4] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2675 (define-key map [?5] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2676 (define-key map [?6] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2677 (define-key map [?7] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2678 (define-key map [?8] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2679 (define-key map [?9] 'digit-argument)
30347
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2680 (define-key map [kp-0] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2681 (define-key map [kp-1] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2682 (define-key map [kp-2] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2683 (define-key map [kp-3] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2684 (define-key map [kp-4] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2685 (define-key map [kp-5] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2686 (define-key map [kp-6] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2687 (define-key map [kp-7] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2688 (define-key map [kp-8] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2689 (define-key map [kp-9] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2690 (define-key map [kp-subtract] 'universal-argument-minus)
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2691 map)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2692 "Keymap used while processing \\[universal-argument].")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2693
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2694 (defvar universal-argument-num-events nil
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2695 "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
2696 `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
2697 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
2698
52966
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2699 (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
2700 "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
2701
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2702 (defvar saved-overriding-map nil
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2703 "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
2704 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
2705 argument mode\".")
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2706
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2707 (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
2708 "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
2709 (unless overriding-map-is-bound
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2710 (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
2711 (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
2712 (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
2713
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2714 (defun restore-overriding-map ()
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2715 "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
2716 (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
2717 (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
2718
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
2719 (defun universal-argument ()
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
2720 "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
2721 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
2722 \\[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
2723 \\[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
2724 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
2725 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
2726 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
2727 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
2728 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
2729 (interactive)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2730 (setq prefix-arg (list 4))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2731 (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
2732 (ensure-overriding-map-is-bound))
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
2733
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2734 ;; 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
2735 ;; 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
2736 (defun universal-argument-more (arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2737 (interactive "P")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2738 (if (consp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2739 (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
2740 (if (eq arg '-)
15e868121a15 (newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents: 17133
diff changeset
2741 (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
2742 (setq prefix-arg arg)
52966
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2743 (restore-overriding-map)))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2744 (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
2745
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2746 (defun negative-argument (arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2747 "Begin a negative numeric argument for the next command.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2748 \\[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
2749 (interactive "P")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2750 (cond ((integerp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2751 (setq prefix-arg (- arg)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2752 ((eq arg '-)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2753 (setq prefix-arg nil))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2754 (t
12313
eca218b0a8ca (negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents: 12266
diff changeset
2755 (setq prefix-arg '-)))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2756 (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
2757 (ensure-overriding-map-is-bound))
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
2758
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
2759 (defun digit-argument (arg)
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
2760 "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
2761 \\[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
2762 (interactive "P")
101010
4efc7ca085ce Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
2763 (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
2764 last-command-event
4efc7ca085ce Replace last-command-char with last-command-event.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
2765 (get last-command-event 'ascii-character)))
30347
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2766 (digit (- (logand char ?\177) ?0)))
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2767 (cond ((integerp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2768 (setq prefix-arg (+ (* arg 10)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2769 (if (< arg 0) (- digit) digit))))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2770 ((eq arg '-)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2771 ;; Treat -0 as just -, so that -01 will work.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2772 (setq prefix-arg (if (zerop digit) '- (- digit))))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2773 (t
12313
eca218b0a8ca (negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents: 12266
diff changeset
2774 (setq prefix-arg digit))))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2775 (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
2776 (ensure-overriding-map-is-bound))
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
2777
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2778 ;; 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
2779 ;; command if digits have already been entered.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2780 (defun universal-argument-minus (arg)
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
2781 (interactive "P")
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2782 (if (integerp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2783 (universal-argument-other-key arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2784 (negative-argument arg)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2785
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2786 ;; 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
2787 ;; executed as a command.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2788 (defun universal-argument-other-key (arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2789 (interactive "P")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2790 (setq prefix-arg arg)
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2791 (let* ((key (this-command-keys))
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2792 (keylist (listify-key-sequence key)))
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2793 (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
2794 (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
2795 unread-command-events)))
12320
979836b1a1a9 (universal-argument-other-key): Call reset-this-command-lengths.
Richard M. Stallman <rms@gnu.org>
parents: 12313
diff changeset
2796 (reset-this-command-lengths)
52966
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2797 (restore-overriding-map))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
2798
108212
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2799 ;; This function is here rather than in subr.el because it uses CL.
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2800 (defmacro with-wrapper-hook (var args &rest body)
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2801 "Run BODY wrapped with the VAR hook.
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2802 VAR is a special hook: its functions are called with a first argument
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2803 which is the \"original\" code (the BODY), so the hook function can wrap
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2804 the original function, or call it any number of times (including not calling
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2805 it at all). This is similar to an `around' advice.
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2806 VAR is normally a symbol (a variable) in which case it is treated like
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2807 a hook, with a buffer-local and a global part. But it can also be an
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2808 arbitrary expression.
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2809 ARGS is a list of variables which will be passed as additional arguments
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2810 to each function, after the initial argument, and which the first argument
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2811 expects to receive when called."
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2812 (declare (indent 2) (debug t))
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2813 ;; We need those two gensyms because CL's lexical scoping is not available
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2814 ;; for function arguments :-(
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2815 (let ((funs (make-symbol "funs"))
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2816 (global (make-symbol "global"))
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2817 (argssym (make-symbol "args")))
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2818 ;; Since the hook is a wrapper, the loop has to be done via
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2819 ;; recursion: a given hook function will call its parameter in order to
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2820 ;; continue looping.
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2821 `(labels ((runrestofhook (,funs ,global ,argssym)
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2822 ;; `funs' holds the functions left on the hook and `global'
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2823 ;; holds the functions left on the global part of the hook
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2824 ;; (in case the hook is local).
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2825 (lexical-let ((funs ,funs)
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2826 (global ,global))
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2827 (if (consp funs)
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2828 (if (eq t (car funs))
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2829 (runrestofhook
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2830 (append global (cdr funs)) nil ,argssym)
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2831 (apply (car funs)
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2832 (lambda (&rest ,argssym)
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2833 (runrestofhook (cdr funs) global ,argssym))
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2834 ,argssym))
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2835 ;; Once there are no more functions on the hook, run
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2836 ;; the original body.
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2837 (apply (lambda ,args ,@body) ,argssym)))))
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2838 (runrestofhook ,var
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2839 ;; The global part of the hook, if any.
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2840 ,(if (symbolp var)
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2841 `(if (local-variable-p ',var)
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2842 (default-value ',var)))
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2843 (list ,@args)))))
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2844
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2845 (defvar filter-buffer-substring-functions nil
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2846 "Wrapper hook around `filter-buffer-substring'.
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2847 The functions on this special hook are called with 4 arguments:
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2848 NEXT-FUN BEG END DELETE
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2849 NEXT-FUN is a function of 3 arguments (BEG END DELETE)
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2850 that performs the default operation. The other 3 arguments are like
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2851 the ones passed to `filter-buffer-substring'.")
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2852
61111
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2853 (defvar buffer-substring-filters nil
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2854 "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
2855 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
2856 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
2857 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
2858 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
2859 return value of `filter-buffer-substring'.
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2860
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2861 If this variable is nil, no filtering is performed.")
108212
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2862 (make-obsolete-variable 'buffer-substring-filters
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2863 'filter-buffer-substring-functions "24.1")
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2864
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2865 (defun filter-buffer-substring (beg end &optional delete)
61111
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2866 "Return the buffer substring between BEG and END, after filtering.
108212
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2867 The filtering is performed by `filter-buffer-substring-functions'.
61111
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2868
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2869 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
2870 from the buffer.
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2871
69899
6626190949c3 (filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents: 69852
diff changeset
2872 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
2873 `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
2874 when you want to allow filtering to take place. For example,
108212
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2875 major or minor modes can use `filter-buffer-substring-functions' to
69899
6626190949c3 (filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents: 69852
diff changeset
2876 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
2877 be copied into other buffers."
108212
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2878 (with-wrapper-hook filter-buffer-substring-functions (beg end delete)
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2879 (cond
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2880 ((or delete buffer-substring-filters)
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2881 (save-excursion
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2882 (goto-char beg)
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2883 (let ((string (if delete (delete-and-extract-region beg end)
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2884 (buffer-substring beg end))))
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2885 (dolist (filter buffer-substring-filters)
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2886 (setq string (funcall filter string)))
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2887 string)))
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2888 (t
41a25ee89427 New hook filter-buffer-substring-functions.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108154
diff changeset
2889 (buffer-substring beg end)))))
69899
6626190949c3 (filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents: 69852
diff changeset
2890
61111
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2891
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2892 ;;;; Window system cut and paste hooks.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2893
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2894 (defvar interprogram-cut-function nil
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2895 "Function to call to make a killed region available to other programs.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2896
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2897 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
2898 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
2899 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
2900 is put in the kill ring, to make the new kill available to other
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2901 programs.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2902
110145
c403c2e0a620 Removed cut-buffer code.
Jan D. <jan.h.d@swipnet.se>
parents: 110134
diff changeset
2903 The function takes one argument, TEXT, which is a string containing
c403c2e0a620 Removed cut-buffer code.
Jan D. <jan.h.d@swipnet.se>
parents: 110134
diff changeset
2904 the text which should be made available.")
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2905
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2906 (defvar interprogram-paste-function nil
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2907 "Function to call to get text cut from other programs.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2908
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2909 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
2910 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
2911 This variable holds a function that Emacs calls to obtain
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2912 text that other programs have provided for pasting.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2913
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2914 The function should be called with no arguments. If the function
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2915 returns nil, then no other program has provided such text, and the top
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2916 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
2917 string, then the caller of the function \(usually `current-kill')
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
2918 should put this string in the kill ring as the latest kill.
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
2919
85397
1404d7fefc24 Tom Horsley <tom.horsley at att.net>
Glenn Morris <rgm@gnu.org>
parents: 85327
diff changeset
2920 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
2921 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
2922 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
2923 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
2924
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
2925 Note that the function should return a string only if a program other
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
2926 than Emacs has provided a string for pasting; if Emacs provided the
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
2927 most recent string, the function should return nil. If it is
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
2928 difficult to tell whether Emacs or some other program provided the
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
2929 current string, it is probably good enough to return nil if the string
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
2930 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
2931
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2932
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
2933
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2934 ;;;; The kill ring data structure.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2935
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2936 (defvar kill-ring nil
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2937 "List of killed text sequences.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2938 Since the kill ring is supposed to interact nicely with cut-and-paste
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2939 facilities offered by window systems, use of this variable should
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2940 interact nicely with `interprogram-cut-function' and
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2941 `interprogram-paste-function'. The functions `kill-new',
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2942 `kill-append', and `current-kill' are supposed to implement this
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2943 interaction; you may want to use them instead of manipulating the kill
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2944 ring directly.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2945
23495
d5f08ad9a40b (kill-ring-max): Increased to 60.
Richard M. Stallman <rms@gnu.org>
parents: 23491
diff changeset
2946 (defcustom kill-ring-max 60
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
2947 "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
2948 :type 'integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2949 :group 'killing)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2950
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2951 (defvar kill-ring-yank-pointer nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2952 "The tail of the kill ring whose car is the last thing yanked.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2953
104624
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
2954 (defcustom save-interprogram-paste-before-kill nil
107168
282ddc0ca465 * simple.el (save-interprogram-paste-before-kill): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 107146
diff changeset
2955 "Save clipboard strings into kill ring before replacing them.
104624
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
2956 When one selects something in another program to paste it into Emacs,
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
2957 but kills something in Emacs before actually pasting it,
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
2958 this selection is gone unless this variable is non-nil,
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
2959 in which case the other program's selection is saved in the `kill-ring'
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
2960 before the Emacs kill and one can still paste it using \\[yank] \\[yank-pop]."
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
2961 :type 'boolean
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
2962 :group 'killing
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
2963 :version "23.2")
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
2964
104645
2ef67426b537 (kill-do-not-save-duplicates): New user option.
Sam Steingold <sds@gnu.org>
parents: 104624
diff changeset
2965 (defcustom kill-do-not-save-duplicates nil
2ef67426b537 (kill-do-not-save-duplicates): New user option.
Sam Steingold <sds@gnu.org>
parents: 104624
diff changeset
2966 "Do not add a new string to `kill-ring' when it is the same as the last one."
2ef67426b537 (kill-do-not-save-duplicates): New user option.
Sam Steingold <sds@gnu.org>
parents: 104624
diff changeset
2967 :type 'boolean
2ef67426b537 (kill-do-not-save-duplicates): New user option.
Sam Steingold <sds@gnu.org>
parents: 104624
diff changeset
2968 :group 'killing
2ef67426b537 (kill-do-not-save-duplicates): New user option.
Sam Steingold <sds@gnu.org>
parents: 104624
diff changeset
2969 :version "23.2")
2ef67426b537 (kill-do-not-save-duplicates): New user option.
Sam Steingold <sds@gnu.org>
parents: 104624
diff changeset
2970
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
2971 (defun kill-new (string &optional replace yank-handler)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2972 "Make STRING the latest kill in the kill ring.
44273
5180d0ff95f6 (kill-new): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 44252
diff changeset
2973 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
2974 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
2975 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
2976 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
2977
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
2978 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
2979 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
2980 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
2981 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
2982
104624
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
2983 When `save-interprogram-paste-before-kill' and `interprogram-paste-function'
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
2984 are non-nil, saves the interprogram paste string(s) into `kill-ring' before
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
2985 STRING.
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
2986
49491
c52c622747ca (kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49364
diff changeset
2987 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
2988 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
2989 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
2990 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
2991 (if (> (length string) 0)
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
2992 (if yank-handler
53931
bfe6c29e5283 (kill-new): Put yank-handler property on the entire string.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53925
diff changeset
2993 (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
2994 '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
2995 (if yank-handler
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
2996 (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
2997 (list string "yank-handler specified for empty string"))))
108889
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
2998 (unless (and kill-do-not-save-duplicates
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
2999 (equal string (car kill-ring)))
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
3000 (if (fboundp 'menu-bar-update-yank-menu)
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
3001 (menu-bar-update-yank-menu string (and replace (car kill-ring)))))
104624
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
3002 (when save-interprogram-paste-before-kill
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
3003 (let ((interprogram-paste (and interprogram-paste-function
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
3004 (funcall interprogram-paste-function))))
eee8a7124ad0 (save-interprogram-paste-before-kill): New user option.
Sam Steingold <sds@gnu.org>
parents: 104592
diff changeset
3005 (when interprogram-paste
108889
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
3006 (dolist (s (if (listp interprogram-paste)
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
3007 (nreverse interprogram-paste)
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
3008 (list interprogram-paste)))
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
3009 (unless (and kill-do-not-save-duplicates
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
3010 (equal s (car kill-ring)))
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
3011 (push s kill-ring))))))
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
3012 (unless (and kill-do-not-save-duplicates
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
3013 (equal string (car kill-ring)))
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
3014 (if (and replace kill-ring)
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
3015 (setcar kill-ring string)
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
3016 (push string kill-ring)
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
3017 (if (> (length kill-ring) kill-ring-max)
e7c6230ab85d * lisp/simple.el (kill-new): Fix logic of kill-do-not-save-duplicates.
Juri Linkov <juri@jurta.org>
parents: 108701
diff changeset
3018 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3019 (setq kill-ring-yank-pointer kill-ring)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3020 (if interprogram-cut-function
110150
f7b8afaa7eb0 * simple.el (kill-new): Call interprogram-cut-function with only one argument.
Jan D <jan.h.d@swipnet.se>
parents: 110145
diff changeset
3021 (funcall interprogram-cut-function string)))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3022
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
3023 (defun kill-append (string before-p &optional yank-handler)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3024 "Append STRING to the end of the latest kill in the kill ring.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3025 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
3026 Optional third argument YANK-HANDLER, if non-nil, specifies the
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
3027 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
3028 string. If the specified yank-handler arg differs from the
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
3029 yank-handler property of the latest kill string, this function
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
3030 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
3031 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
3032 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
3033 (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
3034 (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
3035 (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
3036 (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
3037 yank-handler)))
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3038
87390
82e3843d4fa6 (yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents: 87386
diff changeset
3039 (defcustom yank-pop-change-selection nil
82e3843d4fa6 (yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents: 87386
diff changeset
3040 "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
3041 :type 'boolean
82e3843d4fa6 (yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents: 87386
diff changeset
3042 :group 'killing
82e3843d4fa6 (yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents: 87386
diff changeset
3043 :version "23.1")
82e3843d4fa6 (yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents: 87386
diff changeset
3044
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3045 (defun current-kill (n &optional do-not-move)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3046 "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
3047 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
3048 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
3049 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
3050 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
3051
82e3843d4fa6 (yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents: 87386
diff changeset
3052 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
3053 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
3054 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
3055
82e3843d4fa6 (yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents: 87386
diff changeset
3056 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
3057 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
3058
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3059 (let ((interprogram-paste (and (= n 0)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3060 interprogram-paste-function
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3061 (funcall interprogram-paste-function))))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3062 (if interprogram-paste
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3063 (progn
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3064 ;; Disable the interprogram cut function when we add the new
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3065 ;; text to the kill ring, so Emacs doesn't try to own the
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3066 ;; selection, with identical text.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3067 (let ((interprogram-cut-function nil))
85397
1404d7fefc24 Tom Horsley <tom.horsley at att.net>
Glenn Morris <rgm@gnu.org>
parents: 85327
diff changeset
3068 (if (listp interprogram-paste)
1404d7fefc24 Tom Horsley <tom.horsley at att.net>
Glenn Morris <rgm@gnu.org>
parents: 85327
diff changeset
3069 (mapc 'kill-new (nreverse interprogram-paste))
1404d7fefc24 Tom Horsley <tom.horsley at att.net>
Glenn Morris <rgm@gnu.org>
parents: 85327
diff changeset
3070 (kill-new interprogram-paste)))
1404d7fefc24 Tom Horsley <tom.horsley at att.net>
Glenn Morris <rgm@gnu.org>
parents: 85327
diff changeset
3071 (car kill-ring))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3072 (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
3073 (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
3074 (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
3075 (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
3076 kill-ring)))
87390
82e3843d4fa6 (yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents: 87386
diff changeset
3077 (unless do-not-move
82e3843d4fa6 (yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents: 87386
diff changeset
3078 (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
3079 (when (and yank-pop-change-selection
82e3843d4fa6 (yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents: 87386
diff changeset
3080 (> n 0)
82e3843d4fa6 (yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents: 87386
diff changeset
3081 interprogram-cut-function)
82e3843d4fa6 (yank-pop-change-selection): New option.
Richard M. Stallman <rms@gnu.org>
parents: 87386
diff changeset
3082 (funcall interprogram-cut-function (car ARGth-kill-element))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3083 (car ARGth-kill-element)))))
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3084
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3085
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
3086
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3087 ;;;; Commands for manipulating the kill ring.
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
3088
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3089 (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
3090 "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
3091 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3092 :group 'killing)
7063
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
3093
14507
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
3094 (put 'text-read-only 'error-conditions
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
3095 '(text-read-only buffer-read-only error))
105965
3f64b8380468 * textmodes/ispell.el (ispell-skip-region-alist):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105939
diff changeset
3096 (put 'text-read-only 'error-message (purecopy "Text is read-only"))
14507
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
3097
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
3098 (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
3099 "Kill (\"cut\") text between point and mark.
743351204cc6 (kill-region, yank): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 68829
diff changeset
3100 This deletes the text from the buffer and saves it in the kill ring.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3101 The command \\[yank] can retrieve it from there.
95367
380e5a5c73ea Docstring improvement.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94808
diff changeset
3102 \(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
3103
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
3104 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
3105 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
3106
1834
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
3107 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
3108 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
3109 you can use the killing commands to copy text from a read-only buffer.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3110
109926
34afb1a49d4c * simple.el (kill-region): Doc fix (Bug#6787).
Chong Yidong <cyd@stupidchicken.com>
parents: 109711
diff changeset
3111 Lisp programs should use this function for killing text.
34afb1a49d4c * simple.el (kill-region): Doc fix (Bug#6787).
Chong Yidong <cyd@stupidchicken.com>
parents: 109711
diff changeset
3112 (To delete text, use `delete-region'.)
55975
594a6cacebfe (kill-region): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 55799
diff changeset
3113 Supply two arguments, character positions indicating the stretch of text
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3114 to be killed.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3115 Any command that calls this function is a \"kill command\".
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3116 If the previous command was also a kill command,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3117 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
3118 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
3119
54058
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
3120 In Lisp code, optional third arg YANK-HANDLER, if non-nil,
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
3121 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
3122 text. See `insert-for-yank'."
70826
d3fec44f2362 (kill-region): Interactively, pass point, then mark.
Richard M. Stallman <rms@gnu.org>
parents: 70623
diff changeset
3123 ;; 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
3124 ;; when calling kill-append.
d3fec44f2362 (kill-region): Interactively, pass point, then mark.
Richard M. Stallman <rms@gnu.org>
parents: 70623
diff changeset
3125 (interactive (list (point) (mark)))
72638
abebf4e18f10 (kill-region): Explicitly test there is a region.
Richard M. Stallman <rms@gnu.org>
parents: 72451
diff changeset
3126 (unless (and beg end)
abebf4e18f10 (kill-region): Explicitly test there is a region.
Richard M. Stallman <rms@gnu.org>
parents: 72451
diff changeset
3127 (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
3128 (condition-case nil
61111
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
3129 (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
3130 (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
3131 ;; 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
3132 (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
3133 (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
3134 (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
3135 (when (or string (eq last-command 'kill-region))
54058
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
3136 (setq this-command 'kill-region))
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
3137 nil)
20279
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
3138 ((buffer-read-only text-read-only)
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
3139 ;; 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
3140 ;; in the region, are read-only.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
3141 ;; 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
3142 ;; However, there's no harm in putting
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
3143 ;; 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
3144 (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
3145 ;; 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
3146 (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
3147 ;; 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
3148 (if kill-read-only-ok
54058
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
3149 (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
3150 ;; 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
3151 (barf-if-buffer-read-only)
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
3152 ;; 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
3153 (signal 'text-read-only (list (current-buffer)))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3154
9876
75ecf866cfb8 Comment reason for preceding change.
Karl Heuer <kwzh@gnu.org>
parents: 9870
diff changeset
3155 ;; 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
3156 ;; 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
3157 ;; then corrects it with the intended C-w.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3158 (defun copy-region-as-kill (beg end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3159 "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
3160 In Transient Mark mode, deactivate the mark.
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
3161 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
3162 system cut and paste.
b3ee425c3884 (copy-region-as-kill): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 84609
diff changeset
3163
b3ee425c3884 (copy-region-as-kill): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 84609
diff changeset
3164 This command's old key binding has been given to `kill-ring-save'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3165 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3166 (if (eq last-command 'kill-region)
61111
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
3167 (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
3168 (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
3169 (setq deactivate-mark t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3170 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3171
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3172 (defun kill-ring-save (beg end)
2111
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
3173 "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
3174 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
3175 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
3176 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
3177
36110
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
3178 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
3179 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
3180
3467
002945794814 (kill-ring-save): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 3408
diff changeset
3181 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
3182 visual feedback indicating the extent of the region being copied."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3183 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3184 (copy-region-as-kill beg end)
105372
bd2966850aac Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents: 105051
diff changeset
3185 ;; This use of called-interactively-p is correct
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3186 ;; because the code it controls just gives the user visual feedback.
105372
bd2966850aac Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents: 105051
diff changeset
3187 (if (called-interactively-p 'interactive)
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3188 (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
3189 (opoint (point))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3190 ;; 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
3191 ;; 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
3192 (inhibit-quit t))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3193 (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
3194 ;; 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
3195 ;; 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
3196 (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
3197 (face-background 'region))
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3198 ;; Swap point and mark.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3199 (set-marker (mark-marker) (point) (current-buffer))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3200 (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
3201 (sit-for blink-matching-delay)
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3202 ;; Swap back.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3203 (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
3204 (goto-char opoint)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3205 ;; If user quit, deactivate the mark
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3206 ;; 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
3207 (and quit-flag mark-active
4287
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
3208 (deactivate-mark)))
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3209 (let* ((killed-text (current-kill 0))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3210 (message-len (min (length killed-text) 40)))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3211 (if (= (point) beg)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3212 ;; Don't say "killed"; that is misleading.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3213 (message "Saved text until \"%s\""
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3214 (substring killed-text (- message-len)))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3215 (message "Saved text from \"%s\""
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
3216 (substring killed-text 0 message-len))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3217
24798
6fe40d35360e (append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents: 24789
diff changeset
3218 (defun append-next-kill (&optional interactive)
6fe40d35360e (append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents: 24789
diff changeset
3219 "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
3220 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
3221 (interactive "p")
6fe40d35360e (append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents: 24789
diff changeset
3222 ;; 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
3223 (if interactive
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3224 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3225 (setq this-command 'kill-region)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3226 (message "If the next command is a kill, it will append"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3227 (setq last-command 'kill-region)))
44667
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
3228
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3229 ;; Yanking.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3230
44667
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
3231 ;; 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
3232 (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
3233 '(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
3234 yank-handler follow-link fontified)
84609
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
3235 "Text properties to discard when yanking.
51461
5bcd833ec510 (yank-excluded-properties): Expand documentation string.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51324
diff changeset
3236 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
3237 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
3238 :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
3239 :group 'killing
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59790
diff changeset
3240 :version "22.1")
44667
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
3241
48583
150e7a54d970 (yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 48406
diff changeset
3242 (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
3243 (defvar yank-undo-function nil
49364
25243a7167f4 Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49336
diff changeset
3244 "If non-nil, function used by `yank-pop' to delete last stretch of yanked text.
25243a7167f4 Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49336
diff changeset
3245 Function is called with two parameters, START and END corresponding to
25243a7167f4 Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49336
diff changeset
3246 the value of the mark and point; it is guaranteed that START <= END.
25243a7167f4 Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49336
diff changeset
3247 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
3248
54058
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
3249 (defun yank-pop (&optional arg)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3250 "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
3251 This command is allowed only immediately after a `yank' or a `yank-pop'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3252 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
3253 previously-killed text. `yank-pop' deletes that text and inserts in its
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3254 place a different stretch of killed text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3255
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3256 With no argument, the previous kill is inserted.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3257 With argument N, insert the Nth previous kill.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3258 If N is negative, this is a more recent kill.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3259
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3260 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
3261 comes the newest one.
71a259bf6342 (yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents: 62179
diff changeset
3262
71a259bf6342 (yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents: 62179
diff changeset
3263 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
3264 `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
3265 doc string for `insert-for-yank-1', which see."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3266 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3267 (if (not (eq last-command 'yank))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3268 (error "Previous command was not a yank"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3269 (setq this-command 'yank)
54058
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
3270 (unless arg (setq arg 1))
14507
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
3271 (let ((inhibit-read-only t)
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
3272 (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
3273 (if before
ebc6f47b202e (yank-pop): Always call yank-undo-function with start <= end.
Kim F. Storm <storm@cua.dk>
parents: 49309
diff changeset
3274 (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
3275 (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
3276 (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
3277 (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
3278 (insert-for-yank (current-kill arg))
48583
150e7a54d970 (yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 48406
diff changeset
3279 ;; 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
3280 ;; if possible.
150e7a54d970 (yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 48406
diff changeset
3281 (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
3282 (if before
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
3283 ;; 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
3284 ;; 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
3285 ;; 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
3286 (goto-char (prog1 (mark t)
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
3287 (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
3288 nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3289
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3290 (defun yank (&optional arg)
69410
7f8930333b39 (yank): Fix typo in docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 69396
diff changeset
3291 "Reinsert (\"paste\") the last stretch of killed text.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3292 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
3293 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
3294 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
3295 With argument N, reinsert the Nth most recently killed stretch of killed
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3296 text.
62632
71a259bf6342 (yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents: 62179
diff changeset
3297
71a259bf6342 (yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents: 62179
diff changeset
3298 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
3299 `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
3300 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
3301
73605
f89141aaba7c (yank): Doc fix.
Juri Linkov <juri@jurta.org>
parents: 73416
diff changeset
3302 See also the command `yank-pop' (\\[yank-pop])."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3303 (interactive "*P")
48583
150e7a54d970 (yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 48406
diff changeset
3304 (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
3305 ;; 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
3306 ;; for the following command.
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
3307 (setq this-command t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3308 (push-mark (point))
44667
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
3309 (insert-for-yank (current-kill (cond
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
3310 ((listp arg) 0)
54058
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
3311 ((eq arg '-) -2)
44667
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
3312 (t (1- arg)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3313 (if (consp arg)
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
3314 ;; 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
3315 ;; 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
3316 ;; 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
3317 (goto-char (prog1 (mark t)
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
3318 (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
3319 ;; 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
3320 (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
3321 (setq this-command 'yank))
2111
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
3322 nil)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3323
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3324 (defun rotate-yank-pointer (arg)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3325 "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
3326 With ARG, rotate that many kills forward (or backward, if negative)."
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3327 (interactive "p")
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3328 (current-kill arg))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3329
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3330 ;; Some kill commands.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3331
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3332 ;; Internal subroutine of delete-char
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3333 (defun kill-forward-chars (arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3334 (if (listp arg) (setq arg (car arg)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3335 (if (eq arg '-) (setq arg -1))
102658
3bd929838554 * subr.el (forward-point): Add obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents: 102556
diff changeset
3336 (kill-region (point) (+ (point) arg)))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3337
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3338 ;; Internal subroutine of backward-delete-char
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3339 (defun kill-backward-chars (arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3340 (if (listp arg) (setq arg (car arg)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3341 (if (eq arg '-) (setq arg -1))
102658
3bd929838554 * subr.el (forward-point): Add obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents: 102556
diff changeset
3342 (kill-region (point) (- (point) arg)))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3343
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3344 (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
3345 "The method for untabifying when deleting backward.
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
3346 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
3347 `hungry' -- delete all whitespace, both tabs and spaces;
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
3348 `all' -- delete all whitespace, including tabs, spaces and newlines;
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3349 nil -- just delete one character."
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
3350 :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
3351 :version "20.3"
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3352 :group 'killing)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3353
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3354 (defun backward-delete-char-untabify (arg &optional killp)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3355 "Delete characters backward, changing tabs into spaces.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3356 The exact behavior depends on `backward-delete-char-untabify-method'.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3357 Delete ARG chars, and kill (save in kill ring) if KILLP is non-nil.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3358 Interactively, ARG is the prefix arg (default 1)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3359 and KILLP is t if a prefix arg was specified."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3360 (interactive "*p\nP")
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3361 (when (eq backward-delete-char-untabify-method 'untabify)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3362 (let ((count arg))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3363 (save-excursion
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3364 (while (and (> count 0) (not (bobp)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3365 (if (= (preceding-char) ?\t)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3366 (let ((col (current-column)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3367 (forward-char -1)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3368 (setq col (- col (current-column)))
64548
cff17c5abe4d (clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64289
diff changeset
3369 (insert-char ?\s col)
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3370 (delete-char 1)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3371 (forward-char -1)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3372 (setq count (1- count))))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3373 (delete-backward-char
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
3374 (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
3375 ((eq backward-delete-char-untabify-method 'all)
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
3376 " \t\n\r"))))
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
3377 (if skip
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
3378 (let ((wh (- (point) (save-excursion (skip-chars-backward skip)
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3379 (point)))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3380 (+ arg (if (zerop wh) 0 (1- wh))))
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
3381 arg))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3382 killp))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3383
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3384 (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
3385 "Kill up to and including ARGth occurrence of CHAR.
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3386 Case is ignored if `case-fold-search' is non-nil in the current buffer.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3387 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
3388 (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
3389 ;; 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
3390 (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
3391 (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
3392 (setq char (or (aref translation-table-for-input char) char))))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3393 (kill-region (point) (progn
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3394 (search-forward (char-to-string char) nil nil arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3395 ; (goto-char (if (> arg 0) (1- (point)) (1+ (point))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3396 (point))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
3397
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3398 ;; kill-line and its subroutines.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3399
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3400 (defcustom kill-whole-line nil
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
3401 "If non-nil, `kill-line' with no arg at beg of line kills the whole line."
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3402 :type 'boolean
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3403 :group 'killing)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3404
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3405 (defun kill-line (&optional arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3406 "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
3407 With prefix argument ARG, kill that many lines from point.
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3408 Negative arguments kill lines backward.
32267
b84a9fb24453 (kill-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 32260
diff changeset
3409 With zero argument, kills the text before point on the current line.
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3410
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3411 When calling from a program, nil means \"no arg\",
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3412 a number counts as a prefix arg.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3413
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3414 To kill a whole line, when point is not at the beginning, type \
75995
f4e68d81c310 (kill-line): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 75736
diff changeset
3415 \\[move-beginning-of-line] \\[kill-line] \\[kill-line].
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3416
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3417 If `kill-whole-line' is non-nil, then this command kills the whole line
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3418 including its terminating newline, when used at the beginning of a line
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3419 with no argument. As a consequence, you can always kill a whole line
75995
f4e68d81c310 (kill-line): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 75736
diff changeset
3420 by typing \\[move-beginning-of-line] \\[kill-line].
35916
5a41fb5ed099 (kill-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35886
diff changeset
3421
36110
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
3422 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
3423 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
3424
35916
5a41fb5ed099 (kill-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35886
diff changeset
3425 If the buffer is read-only, Emacs will beep and refrain from deleting
5a41fb5ed099 (kill-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35886
diff changeset
3426 the line, but put the line in the kill ring anyway. This means that
50652
b108545d1f24 (kill-line): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 50383
diff changeset
3427 you can use this command to copy text from a read-only buffer.
b108545d1f24 (kill-line): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 50383
diff changeset
3428 \(If the variable `kill-read-only-ok' is non-nil, then this won't
b108545d1f24 (kill-line): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 50383
diff changeset
3429 even beep.)"
27836
132294fa754e (zap-to-char, kill-line, kill-region, kill-word)
Dave Love <fx@gnu.org>
parents: 27477
diff changeset
3430 (interactive "P")
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3431 (kill-region (point)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3432 ;; It is better to move point to the other end of the kill
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3433 ;; before killing. That way, in a read-only buffer, point
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3434 ;; moves across the text that is copied to the kill ring.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3435 ;; The choice has no effect on undo now that undo records
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3436 ;; the value of point from before the command was run.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3437 (progn
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3438 (if arg
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3439 (forward-visible-line (prefix-numeric-value arg))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3440 (if (eobp)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3441 (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
3442 (let ((end
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
3443 (save-excursion
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
3444 (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
3445 (if (or (save-excursion
54259
86345e064999 (undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents: 54058
diff changeset
3446 ;; If trailing whitespace is visible,
86345e064999 (undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents: 54058
diff changeset
3447 ;; 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
3448 (unless show-trailing-whitespace
86345e064999 (undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents: 54058
diff changeset
3449 (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
3450 (= (point) end))
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
3451 (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
3452 (forward-visible-line 1)
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
3453 (goto-char end))))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3454 (point))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3455
51101
821f85e23a1f * simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51026
diff changeset
3456 (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
3457 "Kill current line.
99654
ade78ac09095 * simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents: 99643
diff changeset
3458 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
3459 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
3460 \(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
3461 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
3462 (interactive "p")
101828
fde299e29d94 (kill-whole-line): Provide a default argument of 1.
Glenn Morris <rgm@gnu.org>
parents: 101577
diff changeset
3463 (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
3464 (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
3465 (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
3466 (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
3467 (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
3468 (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
3469 (kill-new "")
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
3470 (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
3471 (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
3472 ;; 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
3473 ;; 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
3474 ;; 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
3475 ;; 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
3476 ;; 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
3477 ;; 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
3478 (save-excursion
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
3479 (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
3480 (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
3481 ((< arg 0)
51324
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
3482 (save-excursion
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
3483 (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
3484 (kill-region (point)
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
3485 (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
3486 (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
3487 (point))))
51101
821f85e23a1f * simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51026
diff changeset
3488 (t
51324
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
3489 (save-excursion
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
3490 (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
3491 (kill-region (point)
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
3492 (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
3493
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3494 (defun forward-visible-line (arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3495 "Move forward by ARG lines, ignoring currently invisible newlines only.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3496 If ARG is negative, move backward -ARG lines.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3497 If ARG is zero, move to the beginning of the current line."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3498 (condition-case nil
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3499 (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
3500 (progn
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
3501 (while (> arg 0)
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3502 (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
3503 (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
3504 ;; 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
3505 ;; 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
3506 (let ((prop
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
3507 (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
3508 (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
3509 prop
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
3510 (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
3511 (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
3512 (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
3513 (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
3514 ;; 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
3515 ;; skip it.
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
3516 (let ((opoint (point)))
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
3517 (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
3518 (let ((prop
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
3519 (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
3520 (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
3521 prop
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
3522 (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
3523 (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
3524 (goto-char
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
3525 (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
3526 (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
3527 (point-max))
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
3528 (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
3529 (unless (bolp)
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
3530 (goto-char opoint))))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3531 (let ((first t))
51219
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
3532 (while (or first (<= arg 0))
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
3533 (if first
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3534 (beginning-of-line)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3535 (or (zerop (forward-line -1))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3536 (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
3537 ;; 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
3538 ;; 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
3539 (unless (bobp)
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
3540 (let ((prop
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
3541 (get-char-property (1- (point)) 'invisible)))
51219
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
3542 (unless (if (eq buffer-invisibility-spec t)
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
3543 prop
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
3544 (or (memq prop buffer-invisibility-spec)
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
3545 (assq prop buffer-invisibility-spec)))
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
3546 (setq arg (1+ arg)))))
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
3547 (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
3548 ;; 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
3549 ;; skip it.
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
3550 (let ((opoint (point)))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3551 (while (and (not (bobp))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3552 (let ((prop
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3553 (get-char-property (1- (point)) 'invisible)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3554 (if (eq buffer-invisibility-spec t)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3555 prop
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3556 (or (memq prop buffer-invisibility-spec)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3557 (assq prop buffer-invisibility-spec)))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3558 (goto-char
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3559 (if (get-text-property (1- (point)) 'invisible)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3560 (or (previous-single-property-change (point) 'invisible)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3561 (point-min))
47316
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
3562 (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
3563 (unless (bolp)
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
3564 (goto-char opoint)))))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3565 ((beginning-of-buffer end-of-buffer)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3566 nil)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3567
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3568 (defun end-of-visible-line ()
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3569 "Move to end of current visible line."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3570 (end-of-line)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3571 ;; If the following character is currently invisible,
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3572 ;; skip all characters with that same `invisible' property value,
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3573 ;; then find the next newline.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3574 (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
3575 (save-excursion
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
3576 (skip-chars-forward "^\n")
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
3577 (let ((prop
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
3578 (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
3579 (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
3580 prop
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
3581 (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
3582 (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
3583 (skip-chars-forward "^\n")
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3584 (if (get-text-property (point) 'invisible)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3585 (goto-char (next-single-property-change (point) 'invisible))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3586 (goto-char (next-overlay-change (point))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
3587 (end-of-line)))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3588
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3589 (defun insert-buffer (buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3590 "Insert after point the contents of BUFFER.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3591 Puts mark after the inserted text.
26723
b4f7c98850f0 (insert-buffer): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 26521
diff changeset
3592 BUFFER may be a buffer or a buffer name.
b4f7c98850f0 (insert-buffer): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 26521
diff changeset
3593
b4f7c98850f0 (insert-buffer): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 26521
diff changeset
3594 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
3595 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
3596 (interactive
14834
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
3597 (list
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
3598 (progn
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
3599 (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
3600 (read-buffer "Insert buffer: "
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
3601 (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
3602 (other-buffer (current-buffer))
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
3603 (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
3604 t))))
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
3605 (push-mark
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
3606 (save-excursion
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
3607 (insert-buffer-substring (get-buffer buffer))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
3608 (point)))
1982
d65c1fefc636 * simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents: 1838
diff changeset
3609 nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3610
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3611 (defun append-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3612 "Append to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3613 It is inserted into that buffer before its point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3614
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3615 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3616 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3617 START and END specify the portion of the current buffer to be copied."
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
3618 (interactive
10048
db01a04d2afb (append-to-buffer): Don't use current buffer as default.
Richard M. Stallman <rms@gnu.org>
parents: 10034
diff changeset
3619 (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
3620 (region-beginning) (region-end)))
107710
db1a1651507b * simple.el (append-to-buffer): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107670
diff changeset
3621 (let* ((oldbuf (current-buffer))
db1a1651507b * simple.el (append-to-buffer): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107670
diff changeset
3622 (append-to (get-buffer-create buffer))
db1a1651507b * simple.el (append-to-buffer): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107670
diff changeset
3623 (windows (get-buffer-window-list append-to t t))
db1a1651507b * simple.el (append-to-buffer): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107670
diff changeset
3624 point)
db1a1651507b * simple.el (append-to-buffer): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107670
diff changeset
3625 (save-excursion
db1a1651507b * simple.el (append-to-buffer): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107670
diff changeset
3626 (with-current-buffer append-to
db1a1651507b * simple.el (append-to-buffer): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107670
diff changeset
3627 (setq point (point))
db1a1651507b * simple.el (append-to-buffer): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107670
diff changeset
3628 (barf-if-buffer-read-only)
db1a1651507b * simple.el (append-to-buffer): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107670
diff changeset
3629 (insert-buffer-substring oldbuf start end)
db1a1651507b * simple.el (append-to-buffer): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107670
diff changeset
3630 (dolist (window windows)
db1a1651507b * simple.el (append-to-buffer): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107670
diff changeset
3631 (when (= (window-point window) point)
db1a1651507b * simple.el (append-to-buffer): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107670
diff changeset
3632 (set-window-point window (point))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3633
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3634 (defun prepend-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3635 "Prepend to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3636 It is inserted into that buffer after its point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3637
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3638 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3639 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3640 START and END specify the portion of the current buffer to be copied."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3641 (interactive "BPrepend to buffer: \nr")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3642 (let ((oldbuf (current-buffer)))
105994
009383a57ce8 * x-dnd.el (x-dnd-maybe-call-test-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105985
diff changeset
3643 (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
3644 (barf-if-buffer-read-only)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3645 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3646 (insert-buffer-substring oldbuf start end)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3647
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3648 (defun copy-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3649 "Copy to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3650 It is inserted into that buffer, replacing existing text there.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3651
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3652 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3653 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3654 START and END specify the portion of the current buffer to be copied."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3655 (interactive "BCopy to buffer: \nr")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3656 (let ((oldbuf (current-buffer)))
66595
1d442f601f13 (eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66536
diff changeset
3657 (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
3658 (barf-if-buffer-read-only)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3659 (erase-buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3660 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3661 (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
3662
4040
d06d7295d3eb Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents: 3967
diff changeset
3663 (put 'mark-inactive 'error-conditions '(mark-inactive error))
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105712
diff changeset
3664 (put 'mark-inactive 'error-message (purecopy "The mark is not active now"))
4040
d06d7295d3eb Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents: 3967
diff changeset
3665
60463
be3ac492036f (activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents: 60414
diff changeset
3666 (defvar activate-mark-hook nil
be3ac492036f (activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents: 60414
diff changeset
3667 "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
3668 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
3669 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
3670
be3ac492036f (activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents: 60414
diff changeset
3671 (defvar deactivate-mark-hook nil
be3ac492036f (activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents: 60414
diff changeset
3672 "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
3673
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
3674 (defun mark (&optional force)
68042
9ec3cbeca7b8 (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 67886
diff changeset
3675 "Return this buffer's mark value as integer, or nil if never set.
9ec3cbeca7b8 (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 67886
diff changeset
3676
9ec3cbeca7b8 (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 67886
diff changeset
3677 In Transient Mark mode, this function signals an error if
9ec3cbeca7b8 (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 67886
diff changeset
3678 the mark is not active. However, if `mark-even-if-inactive' is non-nil,
9ec3cbeca7b8 (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 67886
diff changeset
3679 or the argument FORCE is non-nil, it disregards whether the mark
9ec3cbeca7b8 (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 67886
diff changeset
3680 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
3681
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3682 If you are using this in an editing command, you are most likely making
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3683 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
3684 (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
3685 (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
3686 (signal 'mark-inactive nil)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3687
106003
acba2c6db48c (x-selection-owner-p): Declare.
Glenn Morris <rgm@gnu.org>
parents: 105994
diff changeset
3688 (declare-function x-selection-owner-p "xselect.c" (&optional selection))
acba2c6db48c (x-selection-owner-p): Declare.
Glenn Morris <rgm@gnu.org>
parents: 105994
diff changeset
3689
103893
c75839749e65 * simple.el (deactivate-mark): Optional argument FORCE.
Chong Yidong <cyd@stupidchicken.com>
parents: 103892
diff changeset
3690 (defsubst deactivate-mark (&optional force)
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
3691 "Deactivate the mark by setting `mark-active' to nil.
103893
c75839749e65 * simple.el (deactivate-mark): Optional argument FORCE.
Chong Yidong <cyd@stupidchicken.com>
parents: 103892
diff changeset
3692 Unless FORCE is non-nil, this function does nothing if Transient
c75839749e65 * simple.el (deactivate-mark): Optional argument FORCE.
Chong Yidong <cyd@stupidchicken.com>
parents: 103892
diff changeset
3693 Mark mode is disabled.
c75839749e65 * simple.el (deactivate-mark): Optional argument FORCE.
Chong Yidong <cyd@stupidchicken.com>
parents: 103892
diff changeset
3694 This function also runs `deactivate-mark-hook'."
c75839749e65 * simple.el (deactivate-mark): Optional argument FORCE.
Chong Yidong <cyd@stupidchicken.com>
parents: 103892
diff changeset
3695 (when (or transient-mark-mode force)
109802
acc05fd0631b Let all active regions set the primary selection.
Chong Yidong <cyd@stupidchicken.com>
parents: 109716
diff changeset
3696 (when (and (if (eq select-active-regions 'only)
acc05fd0631b Let all active regions set the primary selection.
Chong Yidong <cyd@stupidchicken.com>
parents: 109716
diff changeset
3697 (eq (car-safe transient-mark-mode) 'only)
acc05fd0631b Let all active regions set the primary selection.
Chong Yidong <cyd@stupidchicken.com>
parents: 109716
diff changeset
3698 select-active-regions)
109678
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
3699 (region-active-p)
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
3700 (display-selections-p))
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
3701 ;; The var `saved-region-selection', if non-nil, is the text in
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
3702 ;; the region prior to the last command modifying the buffer.
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
3703 ;; Set the selection to that, or to the current region.
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
3704 (cond (saved-region-selection
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
3705 (x-set-selection 'PRIMARY saved-region-selection)
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
3706 (setq saved-region-selection nil))
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
3707 ((/= (region-beginning) (region-end))
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
3708 (x-set-selection 'PRIMARY
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
3709 (buffer-substring-no-properties
109679
0e4b6259df92 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 109678
diff changeset
3710 (region-beginning)
0e4b6259df92 Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 109678
diff changeset
3711 (region-end))))))
103893
c75839749e65 * simple.el (deactivate-mark): Optional argument FORCE.
Chong Yidong <cyd@stupidchicken.com>
parents: 103892
diff changeset
3712 (if (and (null force)
c75839749e65 * simple.el (deactivate-mark): Optional argument FORCE.
Chong Yidong <cyd@stupidchicken.com>
parents: 103892
diff changeset
3713 (or (eq transient-mark-mode 'lambda)
c75839749e65 * simple.el (deactivate-mark): Optional argument FORCE.
Chong Yidong <cyd@stupidchicken.com>
parents: 103892
diff changeset
3714 (and (eq (car-safe transient-mark-mode) 'only)
c75839749e65 * simple.el (deactivate-mark): Optional argument FORCE.
Chong Yidong <cyd@stupidchicken.com>
parents: 103892
diff changeset
3715 (null (cdr transient-mark-mode)))))
c75839749e65 * simple.el (deactivate-mark): Optional argument FORCE.
Chong Yidong <cyd@stupidchicken.com>
parents: 103892
diff changeset
3716 ;; When deactivating a temporary region, don't change
c75839749e65 * simple.el (deactivate-mark): Optional argument FORCE.
Chong Yidong <cyd@stupidchicken.com>
parents: 103892
diff changeset
3717 ;; `mark-active' or run `deactivate-mark-hook'.
93548
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
3718 (setq transient-mark-mode nil)
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
3719 (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
3720 (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
3721 (setq mark-active nil)
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
3722 (run-hooks 'deactivate-mark-hook))))
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
3723
93236
e550714b0fde (activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93169
diff changeset
3724 (defun activate-mark ()
e550714b0fde (activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93169
diff changeset
3725 "Activate the mark."
e550714b0fde (activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93169
diff changeset
3726 (when (mark t)
e550714b0fde (activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93169
diff changeset
3727 (setq mark-active t)
e550714b0fde (activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93169
diff changeset
3728 (unless transient-mark-mode
109678
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
3729 (setq transient-mark-mode 'lambda))))
87386
9ec633b7a53d (select-active-regions): New option.
Richard M. Stallman <rms@gnu.org>
parents: 87377
diff changeset
3730
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3731 (defun set-mark (pos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3732 "Set this buffer's mark to POS. Don't use this function!
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3733 That is to say, don't use this function unless you want
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3734 the user to see that the mark has moved, and you want the previous
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3735 mark position to be lost.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3736
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3737 Normally, when a new mark is set, the old one should go on the stack.
61121
ca079ae96939 (set-mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 61111
diff changeset
3738 This is why most applications should use `push-mark', not `set-mark'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3739
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3740 Novice Emacs Lisp programmers often try to use the mark for the wrong
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3741 purposes. The mark saves a location for the user's convenience.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3742 Most editing commands should not alter the mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3743 To remember a location for internal use in the Lisp program,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3744 store it in a Lisp variable. Example:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3745
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3746 (let ((beg (point))) (forward-line 1) (delete-region beg (point)))."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3747
4287
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
3748 (if pos
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
3749 (progn
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
3750 (setq mark-active t)
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
3751 (run-hooks 'activate-mark-hook)
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
3752 (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
3753 ;; Normally we never clear mark-active except in Transient Mark mode.
103893
c75839749e65 * simple.el (deactivate-mark): Optional argument FORCE.
Chong Yidong <cyd@stupidchicken.com>
parents: 103892
diff changeset
3754 ;; But when we actually clear out the mark value too, we must
c75839749e65 * simple.el (deactivate-mark): Optional argument FORCE.
Chong Yidong <cyd@stupidchicken.com>
parents: 103892
diff changeset
3755 ;; clear mark-active in any mode.
c75839749e65 * simple.el (deactivate-mark): Optional argument FORCE.
Chong Yidong <cyd@stupidchicken.com>
parents: 103892
diff changeset
3756 (deactivate-mark t)
8660
bb7bd2b068bf (set-mark): When POS is nil, always clear mark-active.
Richard M. Stallman <rms@gnu.org>
parents: 8604
diff changeset
3757 (set-marker (mark-marker) nil)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3758
87377
1b576fc3020d (region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 87096
diff changeset
3759 (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
3760 "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
3761 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
3762 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
3763 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
3764
99993
26f94bce1bab Tweak the previous doc fixes.
Chong Yidong <cyd@stupidchicken.com>
parents: 99992
diff changeset
3765 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
3766 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
3767 point otherwise."
87377
1b576fc3020d (region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 87096
diff changeset
3768 :type 'boolean
1b576fc3020d (region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 87096
diff changeset
3769 :version "23.1"
1b576fc3020d (region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 87096
diff changeset
3770 :group 'editing-basics)
1b576fc3020d (region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 87096
diff changeset
3771
87394
06a2cf746b9d (use-region-p): Renamed from `region-active-p'.
Richard M. Stallman <rms@gnu.org>
parents: 87390
diff changeset
3772 (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
3773 "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
3774 This is used by commands that act specially on the region under
103960
8f1c96160773 * simple.el (region-active-p, use-region-p): Doc fix (Bug#3873).
Chong Yidong <cyd@stupidchicken.com>
parents: 103952
diff changeset
3775 Transient Mark mode.
8f1c96160773 * simple.el (region-active-p, use-region-p): Doc fix (Bug#3873).
Chong Yidong <cyd@stupidchicken.com>
parents: 103952
diff changeset
3776
109323
3453c9fcaa97 * simple.el (use-region-p): Doc fix (Bug#6607).
Chong Yidong <cyd@stupidchicken.com>
parents: 109266
diff changeset
3777 The return value is t if Transient Mark mode is enabled and the
109324
4773a5d3ff67 Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 109323
diff changeset
3778 mark is active; furthermore, if `use-empty-active-region' is nil,
4773a5d3ff67 Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 109323
diff changeset
3779 the region must not be empty. Otherwise, the return value is nil.
103960
8f1c96160773 * simple.el (region-active-p, use-region-p): Doc fix (Bug#3873).
Chong Yidong <cyd@stupidchicken.com>
parents: 103952
diff changeset
3780
8f1c96160773 * simple.el (region-active-p, use-region-p): Doc fix (Bug#3873).
Chong Yidong <cyd@stupidchicken.com>
parents: 103952
diff changeset
3781 For some commands, it may be appropriate to ignore the value of
8f1c96160773 * simple.el (region-active-p, use-region-p): Doc fix (Bug#3873).
Chong Yidong <cyd@stupidchicken.com>
parents: 103952
diff changeset
3782 `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
3783 (and (region-active-p)
87377
1b576fc3020d (region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 87096
diff changeset
3784 (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
3785
87396
1073cad4beee (region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 87394
diff changeset
3786 (defun region-active-p ()
87410
5ef4fbedb516 (region-active-p): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 87396
diff changeset
3787 "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
3788
103960
8f1c96160773 * simple.el (region-active-p, use-region-p): Doc fix (Bug#3873).
Chong Yidong <cyd@stupidchicken.com>
parents: 103952
diff changeset
3789 Some commands act specially on the region when Transient Mark
8f1c96160773 * simple.el (region-active-p, use-region-p): Doc fix (Bug#3873).
Chong Yidong <cyd@stupidchicken.com>
parents: 103952
diff changeset
3790 mode is enabled. Usually, such commands should use
8f1c96160773 * simple.el (region-active-p, use-region-p): Doc fix (Bug#3873).
Chong Yidong <cyd@stupidchicken.com>
parents: 103952
diff changeset
3791 `use-region-p' instead of this function, because `use-region-p'
8f1c96160773 * simple.el (region-active-p, use-region-p): Doc fix (Bug#3873).
Chong Yidong <cyd@stupidchicken.com>
parents: 103952
diff changeset
3792 also checks the value of `use-empty-active-region'."
87396
1073cad4beee (region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 87394
diff changeset
3793 (and transient-mark-mode mark-active))
1073cad4beee (region-active-p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 87394
diff changeset
3794
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3795 (defvar mark-ring nil
8695
0f702e9ab06d (mark-ring): Add permanent-local prop. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8660
diff changeset
3796 "The list of former marks of the current buffer, most recent first.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3797 (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
3798 (put 'mark-ring 'permanent-local t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3799
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3800 (defcustom mark-ring-max 16
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
3801 "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
3802 :type 'integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3803 :group 'editing-basics)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3804
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
3805 (defvar global-mark-ring nil
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
3806 "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
3807
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3808 (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
3809 "Maximum size of global mark ring. \
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3810 Start discarding off end if gets this big."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3811 :type 'integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
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
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3814 (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
3815 "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
3816 \(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
3817 (interactive)
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3818 (if (null (mark t))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3819 (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
3820 (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
3821 (message "Mark popped"))
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3822 (goto-char (mark t))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3823 (pop-mark)))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3824
45540
1756da24c6ba (push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents: 45386
diff changeset
3825 (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
3826 "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
3827 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
3828 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
3829 (interactive "P")
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3830 (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
3831 (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
3832 (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
3833 (setq mark-active t)
60463
be3ac492036f (activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents: 60414
diff changeset
3834 (run-hooks 'activate-mark-hook)
45540
1756da24c6ba (push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents: 45386
diff changeset
3835 (unless nomsg
1756da24c6ba (push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents: 45386
diff changeset
3836 (message "Mark activated")))))
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3837
66671
be6d79a520af (set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 66595
diff changeset
3838 (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
3839 "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
3840 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
3841 will pop the mark twice, and
203581a4dee8 (set-mark-command-repeat-pop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 77358
diff changeset
3842 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
3843 will pop the mark three times.
203581a4dee8 (set-mark-command-repeat-pop): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 77358
diff changeset
3844
77714
bc6b6a0db3e3 (set-mark-command-repeat-pop): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 77461
diff changeset
3845 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
3846 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
3847 :type 'boolean
77461
fad036526993 (set-mark-command-repeat-pop): Put in `editing-basics' group.
Richard M. Stallman <rms@gnu.org>
parents: 77459
diff changeset
3848 :group 'editing-basics)
66671
be6d79a520af (set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 66595
diff changeset
3849
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100430
diff changeset
3850 (defcustom set-mark-default-inactive nil
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100430
diff changeset
3851 "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
3852 This causes \\[set-mark-command] and \\[exchange-point-and-mark] to
106028
11d369ec41c4 (set-mark-default-inactive): Add :type, :group
Juri Linkov <juri@jurta.org>
parents: 106011
diff changeset
3853 behave the same whether or not `transient-mark-mode' is enabled."
11d369ec41c4 (set-mark-default-inactive): Add :type, :group
Juri Linkov <juri@jurta.org>
parents: 106011
diff changeset
3854 :type 'boolean
11d369ec41c4 (set-mark-default-inactive): Add :type, :group
Juri Linkov <juri@jurta.org>
parents: 106011
diff changeset
3855 :group 'editing-basics
11d369ec41c4 (set-mark-default-inactive): Add :type, :group
Juri Linkov <juri@jurta.org>
parents: 106011
diff changeset
3856 :version "23.1")
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100430
diff changeset
3857
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3858 (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
3859 "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
3860 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
3861 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
3862 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
3863
9f725c1d891f (pop-to-mark-command): Display message "mark popped" if point does not move.
Richard M. Stallman <rms@gnu.org>
parents: 77074
diff changeset
3864 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
3865 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
3866 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
3867
92715
aa52fda2a68b (set-mark-command): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 92417
diff changeset
3868 When Transient Mark Mode is off, immediately repeating this
aa52fda2a68b (set-mark-command): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 92417
diff changeset
3869 command activates `transient-mark-mode' temporarily.
50251
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
3870
77074
ae905157685c (set-mark-command): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 76915
diff changeset
3871 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
3872 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
3873 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
3874 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
3875 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
3876
68280
c1db05754431 (set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 68042
diff changeset
3877 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
3878 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
3879 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
3880
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
3881 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
3882 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
3883 `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
3884
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3885 Novice Emacs Lisp programmers often try to use the mark for the wrong
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3886 purposes. See the documentation of `set-mark' for more information."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3887 (interactive "P")
93548
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
3888 (cond ((eq transient-mark-mode 'lambda)
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
3889 (setq transient-mark-mode nil))
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
3890 ((eq (car-safe transient-mark-mode) 'only)
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
3891 (deactivate-mark)))
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3892 (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
3893 ((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
3894 (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
3895 ((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
3896 (if arg
92b336df72b8 (pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents: 44586
diff changeset
3897 (pop-to-mark-command)
92b336df72b8 (pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents: 44586
diff changeset
3898 (push-mark-command t)))
66671
be6d79a520af (set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 66595
diff changeset
3899 ((and set-mark-command-repeat-pop
be6d79a520af (set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 66595
diff changeset
3900 (eq last-command 'pop-to-mark-command))
50251
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
3901 (setq this-command 'pop-to-mark-command)
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
3902 (pop-to-mark-command))
66671
be6d79a520af (set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 66595
diff changeset
3903 ((and set-mark-command-repeat-pop
be6d79a520af (set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 66595
diff changeset
3904 (eq last-command 'pop-global-mark)
be6d79a520af (set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 66595
diff changeset
3905 (not arg))
50251
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
3906 (setq this-command 'pop-global-mark)
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
3907 (pop-global-mark))
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3908 (arg
44664
92b336df72b8 (pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents: 44586
diff changeset
3909 (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
3910 (pop-to-mark-command))
93236
e550714b0fde (activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93169
diff changeset
3911 ((eq last-command 'set-mark-command)
e550714b0fde (activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93169
diff changeset
3912 (if (region-active-p)
e550714b0fde (activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93169
diff changeset
3913 (progn
e550714b0fde (activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93169
diff changeset
3914 (deactivate-mark)
e550714b0fde (activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93169
diff changeset
3915 (message "Mark deactivated"))
e550714b0fde (activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93169
diff changeset
3916 (activate-mark)
e550714b0fde (activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93169
diff changeset
3917 (message "Mark activated")))
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3918 (t
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100430
diff changeset
3919 (push-mark-command nil)
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100430
diff changeset
3920 (if set-mark-default-inactive (deactivate-mark)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3921
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
3922 (defun push-mark (&optional location nomsg activate)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3923 "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
3924 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
3925 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
3926 Display `Mark set' unless the optional second arg NOMSG is non-nil.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3927
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3928 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
3929 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
3930
77750
ad5cb9373c74 (push-mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 77714
diff changeset
3931 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
3932 (unless (null (mark t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3933 (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
3934 (when (> (length mark-ring) mark-ring-max)
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
3935 (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
3936 (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
3937 (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
3938 ;; 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
3939 (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
3940 (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
3941 ;; 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
3942 ;; 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
3943 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
3944 (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
3945 (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
3946 (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
3947 (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
3948 (or nomsg executing-kbd-macro (> (minibuffer-depth) 0)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3949 (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
3950 (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
3951 (set-mark (mark t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3952 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3953
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3954 (defun pop-mark ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3955 "Pop off mark ring into the buffer's actual mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3956 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
3957 (when mark-ring
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
3958 (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
3959 (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
3960 (move-marker (car mark-ring) nil)
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
3961 (if (null (mark t)) (ding))
59486
3b3f211ffa93 (pop-mark): Move deactivate-mark out of conditional
Juri Linkov <juri@jurta.org>
parents: 59397
diff changeset
3962 (setq mark-ring (cdr mark-ring)))
3b3f211ffa93 (pop-mark): Move deactivate-mark out of conditional
Juri Linkov <juri@jurta.org>
parents: 59397
diff changeset
3963 (deactivate-mark))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3964
109711
ad23e0fe40f4 * lisp/simple.el (exchange-dot-and-mark): Mark obsolete, finally.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109328
diff changeset
3965 (define-obsolete-function-alias
ad23e0fe40f4 * lisp/simple.el (exchange-dot-and-mark): Mark obsolete, finally.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109328
diff changeset
3966 'exchange-dot-and-mark 'exchange-point-and-mark "23.3")
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3967 (defun exchange-point-and-mark (&optional arg)
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
3968 "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
3969 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
3970 and it reactivates the mark.
93548
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
3971
99654
ade78ac09095 * simple.el (quoted-insert, minibuffer-history-isearch-pop-state, undo)
Juanma Barranquero <lekktu@gmail.com>
parents: 99643
diff changeset
3972 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
3973 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
3974 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
3975 mode temporarily."
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3976 (interactive "P")
93548
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
3977 (let ((omark (mark t))
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
3978 (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
3979 (if (null omark)
e550714b0fde (activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93169
diff changeset
3980 (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
3981 (deactivate-mark)
93236
e550714b0fde (activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93169
diff changeset
3982 (set-mark (point))
e550714b0fde (activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93169
diff changeset
3983 (goto-char omark)
100623
5a144164af93 (completion-all-completions-with-base-size): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 100430
diff changeset
3984 (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
3985 (cond (temp-highlight
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
3986 (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
3987 ((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
3988 (not (or arg (region-active-p))))
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
3989 (deactivate-mark))
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
3990 (t (activate-mark)))
93236
e550714b0fde (activate-mark): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93169
diff changeset
3991 nil))
2796
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
3992
102745
364aae6e6402 * simple.el (shift-select-mode): Make it a defcustom.
Andreas Schwab <schwab@linux-m68k.org>
parents: 102735
diff changeset
3993 (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
3994 "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
3995
07f2395ce3db * callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102685
diff changeset
3996 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
3997 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
3998 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
3999 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
4000 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
4001
07f2395ce3db * callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102685
diff changeset
4002 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
4003 shift-translation."
364aae6e6402 * simple.el (shift-select-mode): Make it a defcustom.
Andreas Schwab <schwab@linux-m68k.org>
parents: 102735
diff changeset
4004 :type 'boolean
364aae6e6402 * simple.el (shift-select-mode): Make it a defcustom.
Andreas Schwab <schwab@linux-m68k.org>
parents: 102735
diff changeset
4005 :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
4006
07f2395ce3db * callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102685
diff changeset
4007 (defun handle-shift-selection ()
102856
5fcdac62cfcd * simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 102813
diff changeset
4008 "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
4009 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
4010 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
4011 running the command itself.
5fcdac62cfcd * simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 102813
diff changeset
4012
5fcdac62cfcd * simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 102813
diff changeset
4013 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
4014 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
4015 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
4016 `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
4017 translation.
5fcdac62cfcd * simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 102813
diff changeset
4018
5fcdac62cfcd * simple.el (handle-shift-selection): Clarify docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 102813
diff changeset
4019 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
4020 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
4021 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
4022 (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
4023 (unless (and mark-active
109678
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
4024 (eq (car-safe transient-mark-mode) 'only))
109456
406b2d52ff00 Revert 2010-07-14 change to deactivate mark; minor cleanups.
Chong Yidong <cyd@stupidchicken.com>
parents: 109448
diff changeset
4025 (setq transient-mark-mode
102735
07f2395ce3db * callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102685
diff changeset
4026 (cons 'only
07f2395ce3db * callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102685
diff changeset
4027 (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
4028 transient-mark-mode)))
07f2395ce3db * callint.c (Fcall_interactively): For '^' just delegate the work to
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 102685
diff changeset
4029 (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
4030 ((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
4031 (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
4032 (deactivate-mark))))
93548
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
4033
47408
2239db3433ca (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47364
diff changeset
4034 (define-minor-mode transient-mark-mode
2796
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
4035 "Toggle Transient Mark mode.
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
4036 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
4037
5372
ac927443eae9 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5343
diff changeset
4038 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
4039 Changing the buffer \"deactivates\" the mark.
ac927443eae9 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5343
diff changeset
4040 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
4041 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
4042 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
4043
37092
c365952bf534 (transient-mark-mode): Mention ESC ESC ESC in the doc string as well.
Eli Zaretskii <eliz@gnu.org>
parents: 37074
diff changeset
4044 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
4045 \\[keyboard-escape-quit].
37074
43067b78ec71 (transient-mark-mode): Mention C-g in the doc string.
Eli Zaretskii <eliz@gnu.org>
parents: 36668
diff changeset
4046
35631
bc0a3dbd22f6 (transient-mark-mode): Document the fact that many
Eli Zaretskii <eliz@gnu.org>
parents: 35589
diff changeset
4047 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
4048 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
4049 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
4050 \\[comment-dwim], \\[flush-lines], \\[keep-lines], \
44dfc09c6b67 * simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents: 58754
diff changeset
4051 \\[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
4052 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
4053 \"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
4054 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
4055 :global t
93169
48813a8a9a5b (transient-mark-mode): Turn on by default.
Chong Yidong <cyd@stupidchicken.com>
parents: 93115
diff changeset
4056 :init-value (not noninteractive)
104990
f0794252d960 * mail/sendmail.el (send-mail-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104922
diff changeset
4057 :initialize 'custom-initialize-delay
91911
07b62dd00afa * simple.el (transient-mark-mode): Add an :init-value.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 91788
diff changeset
4058 :group 'editing-basics)
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
4059
93548
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
4060 ;; 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
4061 ;; values. Document these here.
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
4062 (defvar transient-mark-mode t
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
4063 "*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
4064 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
4065
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
4066 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
4067 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
4068 all windows or just the selected window.
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
4069
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
4070 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
4071 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
4072 \(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
4073
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
4074 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
4075 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
4076 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
4077 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
4078 `transient-mark-mode' is set to OLDVAL.")
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
4079
61986
91b85d61710d (widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 61950
diff changeset
4080 (defvar widen-automatically t
91b85d61710d (widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 61950
diff changeset
4081 "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
4082 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
4083 the current accessible part of the buffer.
91b85d61710d (widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 61950
diff changeset
4084
91b85d61710d (widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 61950
diff changeset
4085 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
4086 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
4087
107856
662fbf539570 (non-essential): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107854
diff changeset
4088 (defvar non-essential nil
662fbf539570 (non-essential): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107854
diff changeset
4089 "Whether the currently executing code is performing an essential task.
662fbf539570 (non-essential): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107854
diff changeset
4090 This variable should be non-nil only when running code which should not
662fbf539570 (non-essential): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107854
diff changeset
4091 disturb the user. E.g. it can be used to prevent Tramp from prompting the
662fbf539570 (non-essential): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107854
diff changeset
4092 user for a password when we are simply scanning a set of files in the
662fbf539570 (non-essential): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107854
diff changeset
4093 background or displaying possible completions before the user even asked
662fbf539570 (non-essential): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107854
diff changeset
4094 for it.")
662fbf539570 (non-essential): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107854
diff changeset
4095
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
4096 (defun pop-global-mark ()
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
4097 "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
4098 (interactive)
7881
4ab8723cd491 (pop-global-mark): Discard entries for nonexistent buffers.
Richard M. Stallman <rms@gnu.org>
parents: 7877
diff changeset
4099 ;; 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
4100 (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
4101 (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
4102 (or global-mark-ring
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
4103 (error "No global mark set"))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
4104 (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
4105 (buffer (marker-buffer marker))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
4106 (position (marker-position marker)))
10351
e34cbd5276bd (pop-global-mark): Make pop-global-mark treat
Richard M. Stallman <rms@gnu.org>
parents: 10284
diff changeset
4107 (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
4108 (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
4109 (set-buffer buffer)
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
4110 (or (and (>= position (point-min))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
4111 (<= position (point-max)))
61986
91b85d61710d (widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 61950
diff changeset
4112 (if widen-automatically
64911
08a222d72566 (pop-global-mark): Reverse test of widen-automatically.
Richard M. Stallman <rms@gnu.org>
parents: 64762
diff changeset
4113 (widen)
08a222d72566 (pop-global-mark): Reverse test of widen-automatically.
Richard M. Stallman <rms@gnu.org>
parents: 64762
diff changeset
4114 (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
4115 (goto-char position)
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
4116 (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
4117
34101
559c35839090 (next-line-add-newlines): Change default to nil.
Gerd Moellmann <gerd@gnu.org>
parents: 34071
diff changeset
4118 (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
4119 "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
4120 :type 'boolean
35333
ac14700e2c6b (next-line-add-newlines): Add :version.
Dave Love <fx@gnu.org>
parents: 35327
diff changeset
4121 :version "21.1"
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4122 :group 'editing-basics)
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
4123
60590
1b9a61c42a06 (next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents: 60486
diff changeset
4124 (defun next-line (&optional arg try-vscroll)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4125 "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
4126 Interactively, vscroll tall lines if `auto-window-vscroll' is enabled.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4127 If there is no character in the target line exactly under the current column,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4128 the cursor is positioned after the character in that line which spans this
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4129 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
4130 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
4131 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
4132 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
4133 cursor to the end of the buffer.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4134
96614
a2cd2be2d2c0 (previous-line, next-line): Update docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 96612
diff changeset
4135 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
4136 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
4137 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
4138
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4139 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
4140 a semipermanent goal column for this command.
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
4141 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
4142 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
4143 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
4144 when there is no goal column.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4145
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4146 If you are thinking of using this in a Lisp program, consider
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4147 using `forward-line' instead. It is usually easier to use
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4148 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
4149 (interactive "^p\np")
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
4150 (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
4151 (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
4152 (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
4153 ;; 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
4154 (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
4155 (end-of-line)
67213
818361523ce8 * longlines.el (longlines-mode): Add mail-setup-hook.
Chong Yidong <cyd@stupidchicken.com>
parents: 67181
diff changeset
4156 (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
4157 (line-move arg nil nil try-vscroll))
105372
bd2966850aac Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents: 105051
diff changeset
4158 (if (called-interactively-p 'interactive)
107721
9b2eadc063cc * simple.el (next-line, previous-line): Re-throw a signal
Juri Linkov <juri@jurta.org>
parents: 107720
diff changeset
4159 (condition-case err
60590
1b9a61c42a06 (next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents: 60486
diff changeset
4160 (line-move arg nil nil try-vscroll)
107721
9b2eadc063cc * simple.el (next-line, previous-line): Re-throw a signal
Juri Linkov <juri@jurta.org>
parents: 107720
diff changeset
4161 ((beginning-of-buffer end-of-buffer)
9b2eadc063cc * simple.el (next-line, previous-line): Re-throw a signal
Juri Linkov <juri@jurta.org>
parents: 107720
diff changeset
4162 (signal (car err) (cdr err))))
60590
1b9a61c42a06 (next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents: 60486
diff changeset
4163 (line-move arg nil nil try-vscroll)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4164 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4165
60590
1b9a61c42a06 (next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents: 60486
diff changeset
4166 (defun previous-line (&optional arg try-vscroll)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4167 "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
4168 Interactively, vscroll tall lines if `auto-window-vscroll' is enabled.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4169 If there is no character in the target line exactly over the current column,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4170 the cursor is positioned after the character in that line which spans this
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4171 column, or at the end of the line if it is not long enough.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4172
96614
a2cd2be2d2c0 (previous-line, next-line): Update docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 96612
diff changeset
4173 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
4174 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
4175 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
4176
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4177 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
4178 a semipermanent goal column for this command.
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
4179 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
4180 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
4181 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
4182 when there is no goal column.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4183
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4184 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
4185 `forward-line' with a negative argument instead. It is usually easier
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4186 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
4187 (interactive "^p\np")
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
4188 (or arg (setq arg 1))
105372
bd2966850aac Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents: 105051
diff changeset
4189 (if (called-interactively-p 'interactive)
107721
9b2eadc063cc * simple.el (next-line, previous-line): Re-throw a signal
Juri Linkov <juri@jurta.org>
parents: 107720
diff changeset
4190 (condition-case err
60590
1b9a61c42a06 (next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents: 60486
diff changeset
4191 (line-move (- arg) nil nil try-vscroll)
107721
9b2eadc063cc * simple.el (next-line, previous-line): Re-throw a signal
Juri Linkov <juri@jurta.org>
parents: 107720
diff changeset
4192 ((beginning-of-buffer end-of-buffer)
9b2eadc063cc * simple.el (next-line, previous-line): Re-throw a signal
Juri Linkov <juri@jurta.org>
parents: 107720
diff changeset
4193 (signal (car err) (cdr err))))
60590
1b9a61c42a06 (next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents: 60486
diff changeset
4194 (line-move (- arg) nil nil try-vscroll))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4195 nil)
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
4196
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4197 (defcustom track-eol nil
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
4198 "Non-nil means vertical motion starting at end of line keeps to ends of lines.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4199 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
4200 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
4201 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
4202 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4203 :group 'editing-basics)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4204
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4205 (defcustom goal-column nil
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
4206 "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
4207 :type '(choice integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4208 (const :tag "None" nil))
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4209 :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
4210 (make-variable-buffer-local 'goal-column)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4211
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4212 (defvar temporary-goal-column 0
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4213 "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
4214 It is the column where point was at the start of the current run
103862
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4215 of vertical motion commands.
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4216
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4217 When moving by visual lines via `line-move-visual', it is a cons
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4218 cell (COL . HSCROLL), where COL is the x-position, in pixels,
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4219 divided by the default column width, and HSCROLL is the number of
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4220 columns by which window is scrolled from left margin.
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4221
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4222 When the `track-eol' feature is doing its job, the value is
96612
6350f3d3cff2 (line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents: 96124
diff changeset
4223 `most-positive-fixnum'.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4224
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4225 (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
4226 "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
4227 Outline mode sets this."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4228 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4229 :group 'editing-basics)
10949
99c9f475a355 (line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10943
diff changeset
4230
96777
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4231 (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
4232 "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
4233 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
4234 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
4235 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
4236 :type 'boolean
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4237 :group 'editing-basics)
96612
6350f3d3cff2 (line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents: 96124
diff changeset
4238
72666
aa474eace5e0 (line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents: 72645
diff changeset
4239 ;; 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
4240 (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
4241 (if (< arg 0)
aa474eace5e0 (line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents: 72645
diff changeset
4242 ;; Move backward (up).
aa474eace5e0 (line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents: 72645
diff changeset
4243 ;; 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
4244 (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
4245 (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
4246 (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
4247
aa474eace5e0 (line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents: 72645
diff changeset
4248 ;; 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
4249 (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
4250 (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
4251 (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
4252 (rbot (nth 3 lh))
84609
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
4253 py vs)
72957
041eaea6e3f2 (line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents: 72923
diff changeset
4254 (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
4255 (>= 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
4256 (<= 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
4257 (unless lh
73014
c44b9d4a6bf6 (line-move-partial): Call pos-visible-in-window-p with
Kim F. Storm <storm@cua.dk>
parents: 73000
diff changeset
4258 (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
4259 (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
4260 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
4261 (cond
041eaea6e3f2 (line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents: 72923
diff changeset
4262 ;; 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
4263 ((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
4264 nil)
041eaea6e3f2 (line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents: 72923
diff changeset
4265 ;; 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
4266 ((and (> vpos 0)
72992
291287d0fa38 (line-move-partial): Optimize. Try window-line-height
Kim F. Storm <storm@cua.dk>
parents: 72957
diff changeset
4267 (< (setq py
291287d0fa38 (line-move-partial): Optimize. Try window-line-height
Kim F. Storm <storm@cua.dk>
parents: 72957
diff changeset
4268 (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
4269 (let ((ppos (posn-at-point)))
291287d0fa38 (line-move-partial): Optimize. Try window-line-height
Kim F. Storm <storm@cua.dk>
parents: 72957
diff changeset
4270 (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
4271 (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
4272 (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
4273 nil)
041eaea6e3f2 (line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents: 72923
diff changeset
4274 ;; 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
4275 ;; 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
4276 ((> (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
4277 (when (> rbot 0)
041eaea6e3f2 (line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents: 72923
diff changeset
4278 (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
4279 ;; 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
4280 ;; 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
4281 ((and (> vpos 0)
041eaea6e3f2 (line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents: 72923
diff changeset
4282 (= 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
4283 (1- vpos))))
041eaea6e3f2 (line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents: 72923
diff changeset
4284 (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
4285 (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
4286 t)
041eaea6e3f2 (line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents: 72923
diff changeset
4287 ;; 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
4288 ((> vpos 0)
041eaea6e3f2 (line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents: 72923
diff changeset
4289 (scroll-up 1)
041eaea6e3f2 (line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents: 72923
diff changeset
4290 t)
041eaea6e3f2 (line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents: 72923
diff changeset
4291 ;; Finally, start vscroll.
041eaea6e3f2 (line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents: 72923
diff changeset
4292 (t
041eaea6e3f2 (line-move-partial): Rework 2006-09-15 change to use
Kim F. Storm <storm@cua.dk>
parents: 72923
diff changeset
4293 (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
4294
aa474eace5e0 (line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents: 72645
diff changeset
4295
63136
bbac4c8066b4 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 63063
diff changeset
4296 ;; This is like line-move-1 except that it also performs
bbac4c8066b4 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 63063
diff changeset
4297 ;; vertical scrolling of tall images if appropriate.
bbac4c8066b4 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 63063
diff changeset
4298 ;; That is not really a clean thing to do, since it mixes
bbac4c8066b4 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 63063
diff changeset
4299 ;; scrolling with cursor motion. But so far we don't have
bbac4c8066b4 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 63063
diff changeset
4300 ;; a cleaner solution to the problem of making C-n do something
bbac4c8066b4 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 63063
diff changeset
4301 ;; 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
4302 (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
4303 (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
4304 ;; 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
4305 (= (abs arg) 1)
aa474eace5e0 (line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents: 72645
diff changeset
4306 ;; 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
4307 (not defining-kbd-macro)
aa474eace5e0 (line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents: 72645
diff changeset
4308 (not executing-kbd-macro)
aa474eace5e0 (line-move-partial): New function to do vscrolling for
Kim F. Storm <storm@cua.dk>
parents: 72645
diff changeset
4309 (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
4310 (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
4311 (if line-move-visual
6350f3d3cff2 (line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents: 96124
diff changeset
4312 (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
4313 (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
4314
6350f3d3cff2 (line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents: 96124
diff changeset
4315 ;; 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
4316 ;; 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
4317 ;; specified number of lines.
6350f3d3cff2 (line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents: 96124
diff changeset
4318 (defun line-move-visual (arg &optional noerror)
104117
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4319 (let ((opoint (point))
103862
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4320 (hscroll (window-hscroll))
104117
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4321 target-hscroll)
103862
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4322 ;; Check if the previous command was a line-motion command, or if
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4323 ;; we were called from some other command.
104117
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4324 (if (and (consp temporary-goal-column)
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4325 (memq last-command `(next-line previous-line ,this-command)))
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4326 ;; If so, there's no need to reset `temporary-goal-column',
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4327 ;; but we may need to hscroll.
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4328 (if (or (/= (cdr temporary-goal-column) hscroll)
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4329 (> (cdr temporary-goal-column) 0))
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4330 (setq target-hscroll (cdr temporary-goal-column)))
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4331 ;; Otherwise, we should reset `temporary-goal-column'.
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4332 (let ((posn (posn-at-point)))
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4333 (cond
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4334 ;; Handle the `overflow-newline-into-fringe' case:
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4335 ((eq (nth 1 posn) 'right-fringe)
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4336 (setq temporary-goal-column (cons (- (window-width) 1) hscroll)))
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4337 ((car (posn-x-y posn))
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4338 (setq temporary-goal-column
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4339 (cons (/ (float (car (posn-x-y posn)))
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4340 (frame-char-width)) hscroll))))))
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4341 (if target-hscroll
cfca1c9b77e2 * simple.el (line-move-visual): Perform hscroll to the recorded position.
Chong Yidong <cyd@stupidchicken.com>
parents: 104116
diff changeset
4342 (set-window-hscroll (selected-window) target-hscroll))
103072
ce405af23a6e * simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents: 102867
diff changeset
4343 (or (and (= (vertical-motion
103862
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4344 (cons (or goal-column
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4345 (if (consp temporary-goal-column)
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4346 (truncate (car temporary-goal-column))
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4347 temporary-goal-column))
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4348 arg))
103072
ce405af23a6e * simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents: 102867
diff changeset
4349 arg)
ce405af23a6e * simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents: 102867
diff changeset
4350 (or (>= arg 0)
ce405af23a6e * simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents: 102867
diff changeset
4351 (/= (point) opoint)
ce405af23a6e * simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents: 102867
diff changeset
4352 ;; 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
4353 ;; `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
4354 ;; 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
4355 ;; 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
4356 (= (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
4357 (unless noerror
ce405af23a6e * simple.el (line-move-visual): If point is stuck moving backwards
Chong Yidong <cyd@stupidchicken.com>
parents: 102867
diff changeset
4358 (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
4359 nil)))))
59680
1d33b3da1157 (line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents: 59626
diff changeset
4360
11326
0d5ebc078c51 (line-move): Turn off intangibility for intermediate stops.
Richard M. Stallman <rms@gnu.org>
parents: 11324
diff changeset
4361 ;; 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
4362 ;; 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
4363 ;; 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
4364 (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
4365 ;; 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
4366 ;; for intermediate positions.
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
4367 (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
4368 (opoint (point))
73000
fea9765e7991 * simple.el (line-move-1): Escape field boundaries occurring
Chong Yidong <cyd@stupidchicken.com>
parents: 72992
diff changeset
4369 (orig-arg arg))
103862
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4370 (if (consp temporary-goal-column)
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4371 (setq temporary-goal-column (+ (car temporary-goal-column)
b760b8569489 * simple.el (temporary-goal-column): Change the value for
Chong Yidong <cyd@stupidchicken.com>
parents: 103694
diff changeset
4372 (cdr 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
4373 (unwind-protect
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
4374 (progn
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4375 (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
4376 (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
4377 (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
4378 ;; 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
4379 ;; 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
4380 (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
4381 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
4382 (current-column))))
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4383
84609
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
4384 (if (not (or (integerp selective-display)
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
4385 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
4386 ;; 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
4387 ;; 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
4388 (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
4389 (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
4390 ;; 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
4391 ;; 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
4392 ;; 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
4393 (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
4394 (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
4395 (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
4396 (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
4397 (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
4398 (setq arg 0)))
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4399 (unless noerror
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4400 (signal (if (< arg 0)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4401 'beginning-of-buffer
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4402 'end-of-buffer)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4403 nil)))
11479
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
4404 ;; 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
4405 (let (done)
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4406 (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
4407 ;; 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
4408 ;; 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
4409 (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
4410 (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
4411 ;; Move a line.
fea9765e7991 * simple.el (line-move-1): Escape field boundaries occurring
Chong Yidong <cyd@stupidchicken.com>
parents: 72992
diff changeset
4412 ;; 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
4413 ;; 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
4414 (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
4415 (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
4416 (line-end-position))
1a4b3e645c66 (line-move-1): Respect `inhibit-line-move-field-capture' property.
Chong Yidong <cyd@stupidchicken.com>
parents: 76386
diff changeset
4417 (point) t t
1a4b3e645c66 (line-move-1): Respect `inhibit-line-move-field-capture' property.
Chong Yidong <cyd@stupidchicken.com>
parents: 76386
diff changeset
4418 '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
4419 ;; 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
4420 (cond
549c22d3fe54 (line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents: 64285
diff changeset
4421 ((eobp)
549c22d3fe54 (line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents: 64285
diff changeset
4422 (if (not noerror)
549c22d3fe54 (line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents: 64285
diff changeset
4423 (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
4424 (setq done t)))
549c22d3fe54 (line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents: 64285
diff changeset
4425 ((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
4426 (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
4427 (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
4428 ;; 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
4429 ;; 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
4430 (forward-line 1))
549c22d3fe54 (line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents: 64285
diff changeset
4431 ;; 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
4432 ((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
4433 (if (not noerror)
549c22d3fe54 (line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents: 64285
diff changeset
4434 (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
4435 (setq done t))))
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4436 (unless done
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4437 (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
4438 ;; 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
4439 ;; 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
4440 (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
4441 ;; 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
4442 ;; 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
4443 ;; 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
4444 ;; 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
4445 ;; 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
4446 ;; 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
4447 ;; gets stuck -- cyd
5fdade8e4fef * simple.el (line-move-1): During fields during motion to the
Chong Yidong <cyd@stupidchicken.com>
parents: 73330
diff changeset
4448 (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
4449 (cond
549c22d3fe54 (line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents: 64285
diff changeset
4450 ((bobp)
549c22d3fe54 (line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents: 64285
diff changeset
4451 (if (not noerror)
549c22d3fe54 (line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents: 64285
diff changeset
4452 (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
4453 (setq done t)))
549c22d3fe54 (line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents: 64285
diff changeset
4454 ((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
4455 (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
4456 (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
4457 (forward-line -1))
549c22d3fe54 (line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents: 64285
diff changeset
4458 ((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
4459 (if (not noerror)
549c22d3fe54 (line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents: 64285
diff changeset
4460 (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
4461 (setq done t))))
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4462 (unless done
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4463 (setq arg (1+ arg))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4464 (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
4465 ;; 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
4466 (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
4467 (< arg 0))
78658
6a12da4aa52f (invisible-p): Rename from text-invisible-p. Update callers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78611
diff changeset
4468 (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
4469 (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
4470 ;; 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
4471 (= arg 0))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4472
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
4473 (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
4474 ;; 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
4475 ;; 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
4476 ;; 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
4477 (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
4478 (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
4479 (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
4480 (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
4481 ((< arg 0)
64598
e139156061a7 (line-move-1): Fix comments.
Juri Linkov <juri@jurta.org>
parents: 64548
diff changeset
4482 ;; 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
4483 ;; 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
4484 (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
4485 (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
4486 (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
4487 (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
4488 (t
58354
36916d006f6b (line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents: 58046
diff changeset
4489 (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
4490 opoint (> orig-arg 0)))))))
58354
36916d006f6b (line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents: 58046
diff changeset
4491
36916d006f6b (line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents: 58046
diff changeset
4492 (defun line-move-finish (column opoint forward)
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4493 (let ((repeat t))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4494 (while repeat
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4495 ;; 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
4496 (setq repeat nil)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4497
44756
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
4498 (let (new
73109
4a02fd618570 * simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents: 73101
diff changeset
4499 (old (point))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4500 (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
4501 (line-end
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
4502 ;; Compute the end of the line
58354
36916d006f6b (line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents: 58046
diff changeset
4503 ;; ignoring effectively invisible newlines.
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4504 (save-excursion
66346
37f27a66c519 (line-move-finish): Ignore fields computing LINE-END.
Richard M. Stallman <rms@gnu.org>
parents: 66281
diff changeset
4505 ;; 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
4506 (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
4507 (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
4508 (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
4509 (skip-chars-forward "^\n"))
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4510 (point))))
44756
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
4511
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
4512 ;; Move to the desired column.
104116
97987e968cf8 * simple.el (line-move-finish): Pass whole number to
Chong Yidong <cyd@stupidchicken.com>
parents: 104023
diff changeset
4513 (line-move-to-column (truncate column))
73109
4a02fd618570 * simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents: 73101
diff changeset
4514
4a02fd618570 * simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents: 73101
diff changeset
4515 ;; 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
4516 ;; 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
4517 ;; 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
4518 ;; 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
4519 ;; 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
4520 ;; (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
4521 (and forward
4a02fd618570 * simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents: 73101
diff changeset
4522 (< (point) old)
4a02fd618570 * simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents: 73101
diff changeset
4523 (goto-char old))
4a02fd618570 * simple.el (line-move-finish): Handle corner case for fields in
Chong Yidong <cyd@stupidchicken.com>
parents: 73101
diff changeset
4524
44756
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
4525 (setq new (point))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4526
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4527 ;; Process intangibility within a line.
70842
8b271981e0c5 Update comments.
Chong Yidong <cyd@stupidchicken.com>
parents: 70826
diff changeset
4528 ;; With inhibit-point-motion-hooks bound to nil, a call to
8b271981e0c5 Update comments.
Chong Yidong <cyd@stupidchicken.com>
parents: 70826
diff changeset
4529 ;; goto-char moves point past intangible text.
8b271981e0c5 Update comments.
Chong Yidong <cyd@stupidchicken.com>
parents: 70826
diff changeset
4530
8b271981e0c5 Update comments.
Chong Yidong <cyd@stupidchicken.com>
parents: 70826
diff changeset
4531 ;; However, inhibit-point-motion-hooks controls both the
8b271981e0c5 Update comments.
Chong Yidong <cyd@stupidchicken.com>
parents: 70826
diff changeset
4532 ;; intangibility and the point-entered/point-left hooks. The
8b271981e0c5 Update comments.
Chong Yidong <cyd@stupidchicken.com>
parents: 70826
diff changeset
4533 ;; following hack avoids calling the point-* hooks
8b271981e0c5 Update comments.
Chong Yidong <cyd@stupidchicken.com>
parents: 70826
diff changeset
4534 ;; unnecessarily. Note that we move *forward* past intangible
8b271981e0c5 Update comments.
Chong Yidong <cyd@stupidchicken.com>
parents: 70826
diff changeset
4535 ;; 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
4536 (goto-char new)
70623
2ed5d4bbedbf * simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 70620
diff changeset
4537 (let ((inhibit-point-motion-hooks nil))
2ed5d4bbedbf * simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 70620
diff changeset
4538 (goto-char new)
2ed5d4bbedbf * simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 70620
diff changeset
4539
2ed5d4bbedbf * simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 70620
diff changeset
4540 ;; 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
4541 ;; 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
4542 (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
4543 (setq new (point))
70623
2ed5d4bbedbf * simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 70620
diff changeset
4544 ;; If that position is "too late",
2ed5d4bbedbf * simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 70620
diff changeset
4545 ;; try the previous allowable position.
2ed5d4bbedbf * simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 70620
diff changeset
4546 ;; See if it is ok.
2ed5d4bbedbf * simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 70620
diff changeset
4547 (backward-char)
2ed5d4bbedbf * simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 70620
diff changeset
4548 (if (if forward
2ed5d4bbedbf * simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 70620
diff changeset
4549 ;; 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
4550 ;; 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
4551 (< line-beg (point))
2ed5d4bbedbf * simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 70620
diff changeset
4552 ;; 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
4553 ;; 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
4554 (<= (point) line-end))
2ed5d4bbedbf * simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 70620
diff changeset
4555 (setq new (point))
2ed5d4bbedbf * simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 70620
diff changeset
4556 ;; 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
4557 (setq new line-end))))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4558
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4559 ;; Now move to the updated destination, processing fields
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4560 ;; as well as intangibility.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4561 (goto-char opoint)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4562 (let ((inhibit-point-motion-hooks nil))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4563 (goto-char
73167
1b3313de1c4c * simple.el (line-move-finish): Ignore field boundaries if the
Chong Yidong <cyd@stupidchicken.com>
parents: 73109
diff changeset
4564 ;; 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
4565 ;; 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
4566 ;; 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
4567 ;; behavior in many situations.
1b3313de1c4c * simple.el (line-move-finish): Ignore field boundaries if the
Chong Yidong <cyd@stupidchicken.com>
parents: 73109
diff changeset
4568 (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
4569 (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
4570 new
1b3313de1c4c * simple.el (line-move-finish): Ignore field boundaries if the
Chong Yidong <cyd@stupidchicken.com>
parents: 73109
diff changeset
4571 (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
4572 'inhibit-line-move-field-capture))))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4573
44756
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
4574 ;; 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
4575 ;; retry everything within that new line.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4576 (when (or (< (point) line-beg) (> (point) line-end))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4577 ;; Repeat the intangibility and field processing.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4578 (setq repeat t))))))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4579
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4580 (defun line-move-to-column (col)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4581 "Try to find column COL, considering invisibility.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4582 This function works only in certain cases,
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4583 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
4584 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
4585 (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
4586 (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
4587 (move-to-column col))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4588
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4589 (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
4590 (not (bolp)) (invisible-p (1- (point))))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4591 (let ((normal-location (point))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4592 (normal-column (current-column)))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4593 ;; If the following character is currently invisible,
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4594 ;; 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
4595 (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
4596 (invisible-p (point)))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4597 (goto-char (next-char-property-change (point))))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4598 ;; Have we advanced to a larger column position?
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4599 (if (> (current-column) normal-column)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4600 ;; 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
4601 ;; See if we can make any further progress.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4602 (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
4603 ;; Otherwise, go to the place we originally found
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4604 ;; and move back over invisible text.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4605 ;; 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
4606 ;; but with a more reasonable buffer position.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4607 (goto-char normal-location)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
4608 (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
4609 (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
4610 (goto-char (previous-char-property-change (point) line-beg))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4611
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4612 (defun move-end-of-line (arg)
68042
9ec3cbeca7b8 (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 67886
diff changeset
4613 "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
4614 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
4615 If point reaches the beginning or end of buffer, it stops there.
100880
c30d9af11159 Minor doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 100821
diff changeset
4616
c30d9af11159 Minor doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 100821
diff changeset
4617 To ignore the effects of the `intangible' text or overlay
c30d9af11159 Minor doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 100821
diff changeset
4618 property, bind `inhibit-point-motion-hooks' to t.
c30d9af11159 Minor doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 100821
diff changeset
4619 If there is an image in the current line, this function
c30d9af11159 Minor doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 100821
diff changeset
4620 disregards newlines that are part of the text on which the image
c30d9af11159 Minor doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 100821
diff changeset
4621 rests."
93548
715d9d088f88 (deactivate-mark): When the mark is temporarily
Chong Yidong <cyd@stupidchicken.com>
parents: 93397
diff changeset
4622 (interactive "^p")
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4623 (or arg (setq arg 1))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4624 (let (done)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4625 (while (not done)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4626 (let ((newpos
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4627 (save-excursion
96612
6350f3d3cff2 (line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents: 96124
diff changeset
4628 (let ((goal-column 0)
6350f3d3cff2 (line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents: 96124
diff changeset
4629 (line-move-visual nil))
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4630 (and (line-move arg t)
108701
126aa20e97d5 Fix C-e when bidi reordering is in effect.
Eli Zaretskii <eliz@gnu.org>
parents: 108632
diff changeset
4631 ;; With bidi reordering, we may not be at bol,
126aa20e97d5 Fix C-e when bidi reordering is in effect.
Eli Zaretskii <eliz@gnu.org>
parents: 108632
diff changeset
4632 ;; so make sure we are.
126aa20e97d5 Fix C-e when bidi reordering is in effect.
Eli Zaretskii <eliz@gnu.org>
parents: 108632
diff changeset
4633 (skip-chars-backward "^\n")
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4634 (not (bobp))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4635 (progn
78658
6a12da4aa52f (invisible-p): Rename from text-invisible-p. Update callers.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78611
diff changeset
4636 (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
4637 (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
4638 (point) 'invisible)))
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4639 (backward-char 1)))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4640 (point)))))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4641 (goto-char newpos)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4642 (if (and (> (point) newpos)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4643 (eq (preceding-char) ?\n))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4644 (backward-char 1)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4645 (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
4646 (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
4647 ;; 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
4648 ;; 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
4649 (setq arg 1)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4650 (setq done t)))))))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
4651
60486
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
4652 (defun move-beginning-of-line (arg)
68042
9ec3cbeca7b8 (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 67886
diff changeset
4653 "Move point to beginning of current line as displayed.
9ec3cbeca7b8 (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 67886
diff changeset
4654 \(If there's an image in the line, this disregards newlines
9ec3cbeca7b8 (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 67886
diff changeset
4655 which are part of the text that the image rests on.)
9ec3cbeca7b8 (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 67886
diff changeset
4656
60486
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
4657 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
4658 If point reaches the beginning or end of buffer, it stops there.
68042
9ec3cbeca7b8 (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 67886
diff changeset
4659 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
4660 (interactive "^p")
60486
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
4661 (or arg (setq arg 1))
69899
6626190949c3 (filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents: 69852
diff changeset
4662
72411
b11613448626 (move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents: 72254
diff changeset
4663 (let ((orig (point))
84609
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
4664 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
4665
18c6a9d97dc1 (move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents: 68352
diff changeset
4666 ;; 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
4667 (if (/= arg 1)
96612
6350f3d3cff2 (line-move-visual): Obey goal-column and no-error arg.
Chong Yidong <cyd@stupidchicken.com>
parents: 96124
diff changeset
4668 (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
4669 (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
4670
18c6a9d97dc1 (move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents: 68352
diff changeset
4671 ;; 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
4672 (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
4673 (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
4674 (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
4675 (skip-chars-backward "^\n"))
72411
b11613448626 (move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents: 72254
diff changeset
4676
b11613448626 (move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents: 72254
diff changeset
4677 ;; 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
4678 (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
4679 (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
4680 (setq first-vis (point))
b11613448626 (move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents: 72254
diff changeset
4681
b11613448626 (move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents: 72254
diff changeset
4682 ;; 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
4683 (setq first-vis-field-value
b11613448626 (move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents: 72254
diff changeset
4684 (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
4685
b11613448626 (move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents: 72254
diff changeset
4686 (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
4687 ;; If yes, obey them.
b11613448626 (move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents: 72254
diff changeset
4688 first-vis-field-value
b11613448626 (move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents: 72254
diff changeset
4689 ;; 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
4690 ;; (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
4691 (constrain-to-field (point) orig
b11613448626 (move-beginning-of-line): Test whether fields
Richard M. Stallman <rms@gnu.org>
parents: 72254
diff changeset
4692 (/= arg 1) t nil)))))
60486
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
4693
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
4694
104345
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
4695 ;; Many people have said they rarely use this feature, and often type
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
4696 ;; it by accident. Maybe it shouldn't even be on a key.
1771
3f0f18d4eb8c * simple.el (set-goal-column): Make this command disabled by default.
Jim Blandy <jimb@redhat.com>
parents: 1760
diff changeset
4697 (put 'set-goal-column 'disabled t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4698
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4699 (defun set-goal-column (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4700 "Set the current horizontal position as a goal for \\[next-line] and \\[previous-line].
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4701 Those commands will move to this position in the line moved to
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4702 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
4703 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
4704 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
4705 The goal column is stored in the variable `goal-column'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4706 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4707 (if arg
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4708 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4709 (setq goal-column nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4710 (message "No goal column"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4711 (setq goal-column (current-column))
65582
4d1085b02d64 Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents: 65521
diff changeset
4712 ;; 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
4713 ;; to a sequence containing %
4d1085b02d64 Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents: 65521
diff changeset
4714 ;;(message (substitute-command-keys
4d1085b02d64 Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents: 65521
diff changeset
4715 ;;"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
4716 ;;goal-column)
4d1085b02d64 Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents: 65521
diff changeset
4717 (message "%s"
66823
e0104334e066 (what-cursor-position): Print (EOB) instead of (100%)
Kim F. Storm <storm@cua.dk>
parents: 66671
diff changeset
4718 (concat
65582
4d1085b02d64 Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents: 65521
diff changeset
4719 (format "Goal column %d " goal-column)
4d1085b02d64 Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents: 65521
diff changeset
4720 (substitute-command-keys
4d1085b02d64 Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents: 65521
diff changeset
4721 "(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
4722
65582
4d1085b02d64 Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents: 65521
diff changeset
4723 )
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4724 nil)
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
4725
96777
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4726 ;;; 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
4727
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4728 (defun end-of-visual-line (&optional n)
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4729 "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
4730 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
4731 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
4732 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
4733 (interactive "^p")
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4734 (or n (setq n 1))
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4735 (if (/= n 1)
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4736 (let ((line-move-visual t))
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4737 (line-move (1- n) t)))
106459
44e685ee32cb * simple.el (beginning-of-visual-line): Constrain to field
Chong Yidong <cyd@stupidchicken.com>
parents: 106357
diff changeset
4738 ;; Unlike `move-beginning-of-line', `move-end-of-line' doesn't
44e685ee32cb * simple.el (beginning-of-visual-line): Constrain to field
Chong Yidong <cyd@stupidchicken.com>
parents: 106357
diff changeset
4739 ;; constrain to field boundaries, so we don't either.
96777
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4740 (vertical-motion (cons (window-width) 0)))
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4741
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4742 (defun beginning-of-visual-line (&optional n)
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4743 "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
4744 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
4745 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
4746 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
4747 (interactive "^p")
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4748 (or n (setq n 1))
106459
44e685ee32cb * simple.el (beginning-of-visual-line): Constrain to field
Chong Yidong <cyd@stupidchicken.com>
parents: 106357
diff changeset
4749 (let ((opoint (point)))
44e685ee32cb * simple.el (beginning-of-visual-line): Constrain to field
Chong Yidong <cyd@stupidchicken.com>
parents: 106357
diff changeset
4750 (if (/= n 1)
44e685ee32cb * simple.el (beginning-of-visual-line): Constrain to field
Chong Yidong <cyd@stupidchicken.com>
parents: 106357
diff changeset
4751 (let ((line-move-visual t))
44e685ee32cb * simple.el (beginning-of-visual-line): Constrain to field
Chong Yidong <cyd@stupidchicken.com>
parents: 106357
diff changeset
4752 (line-move (1- n) t)))
44e685ee32cb * simple.el (beginning-of-visual-line): Constrain to field
Chong Yidong <cyd@stupidchicken.com>
parents: 106357
diff changeset
4753 (vertical-motion 0)
44e685ee32cb * simple.el (beginning-of-visual-line): Constrain to field
Chong Yidong <cyd@stupidchicken.com>
parents: 106357
diff changeset
4754 ;; Constrain to field boundaries, like `move-beginning-of-line'.
44e685ee32cb * simple.el (beginning-of-visual-line): Constrain to field
Chong Yidong <cyd@stupidchicken.com>
parents: 106357
diff changeset
4755 (goto-char (constrain-to-field (point) opoint (/= n 1)))))
96777
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4756
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4757 (defun kill-visual-line (&optional arg)
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4758 "Kill the rest of the visual line.
103417
5cf7afafabf1 * simple.el (kill-visual-line): Rewrite (Bug#3437). Don't try to
Chong Yidong <cyd@stupidchicken.com>
parents: 103201
diff changeset
4759 With prefix argument ARG, kill that many visual lines from point.
5cf7afafabf1 * simple.el (kill-visual-line): Rewrite (Bug#3437). Don't try to
Chong Yidong <cyd@stupidchicken.com>
parents: 103201
diff changeset
4760 If ARG is negative, kill visual lines backward.
5cf7afafabf1 * simple.el (kill-visual-line): Rewrite (Bug#3437). Don't try to
Chong Yidong <cyd@stupidchicken.com>
parents: 103201
diff changeset
4761 If ARG is zero, kill the text before point on the current visual
5cf7afafabf1 * simple.el (kill-visual-line): Rewrite (Bug#3437). Don't try to
Chong Yidong <cyd@stupidchicken.com>
parents: 103201
diff changeset
4762 line.
96777
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4763
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4764 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
4765 use \\[append-next-kill] before \\[kill-line].
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4766
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4767 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
4768 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
4769 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
4770 \(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
4771 even beep.)"
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4772 (interactive "P")
103417
5cf7afafabf1 * simple.el (kill-visual-line): Rewrite (Bug#3437). Don't try to
Chong Yidong <cyd@stupidchicken.com>
parents: 103201
diff changeset
4773 ;; Like in `kill-line', it's better to move point to the other end
5cf7afafabf1 * simple.el (kill-visual-line): Rewrite (Bug#3437). Don't try to
Chong Yidong <cyd@stupidchicken.com>
parents: 103201
diff changeset
4774 ;; of the kill before killing.
103896
a4d216dbf517 * simple.el (kill-visual-line): Obey kill-whole-line (Bug#3695).
Chong Yidong <cyd@stupidchicken.com>
parents: 103893
diff changeset
4775 (let ((opoint (point))
a4d216dbf517 * simple.el (kill-visual-line): Obey kill-whole-line (Bug#3695).
Chong Yidong <cyd@stupidchicken.com>
parents: 103893
diff changeset
4776 (kill-whole-line (and kill-whole-line (bolp))))
96777
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4777 (if arg
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4778 (vertical-motion (prefix-numeric-value arg))
103417
5cf7afafabf1 * simple.el (kill-visual-line): Rewrite (Bug#3437). Don't try to
Chong Yidong <cyd@stupidchicken.com>
parents: 103201
diff changeset
4779 (end-of-visual-line 1)
5cf7afafabf1 * simple.el (kill-visual-line): Rewrite (Bug#3437). Don't try to
Chong Yidong <cyd@stupidchicken.com>
parents: 103201
diff changeset
4780 (if (= (point) opoint)
5cf7afafabf1 * simple.el (kill-visual-line): Rewrite (Bug#3437). Don't try to
Chong Yidong <cyd@stupidchicken.com>
parents: 103201
diff changeset
4781 (vertical-motion 1)
5cf7afafabf1 * simple.el (kill-visual-line): Rewrite (Bug#3437). Don't try to
Chong Yidong <cyd@stupidchicken.com>
parents: 103201
diff changeset
4782 ;; Skip any trailing whitespace at the end of the visual line.
5cf7afafabf1 * simple.el (kill-visual-line): Rewrite (Bug#3437). Don't try to
Chong Yidong <cyd@stupidchicken.com>
parents: 103201
diff changeset
4783 ;; We used to do this only if `show-trailing-whitespace' is
5cf7afafabf1 * simple.el (kill-visual-line): Rewrite (Bug#3437). Don't try to
Chong Yidong <cyd@stupidchicken.com>
parents: 103201
diff changeset
4784 ;; nil, but that's wrong; the correct thing would be to check
5cf7afafabf1 * simple.el (kill-visual-line): Rewrite (Bug#3437). Don't try to
Chong Yidong <cyd@stupidchicken.com>
parents: 103201
diff changeset
4785 ;; whether the trailing whitespace is highlighted. But, it's
5cf7afafabf1 * simple.el (kill-visual-line): Rewrite (Bug#3437). Don't try to
Chong Yidong <cyd@stupidchicken.com>
parents: 103201
diff changeset
4786 ;; OK to just do this unconditionally.
5cf7afafabf1 * simple.el (kill-visual-line): Rewrite (Bug#3437). Don't try to
Chong Yidong <cyd@stupidchicken.com>
parents: 103201
diff changeset
4787 (skip-chars-forward " \t")))
103896
a4d216dbf517 * simple.el (kill-visual-line): Obey kill-whole-line (Bug#3695).
Chong Yidong <cyd@stupidchicken.com>
parents: 103893
diff changeset
4788 (kill-region opoint (if (and kill-whole-line (looking-at "\n"))
a4d216dbf517 * simple.el (kill-visual-line): Obey kill-whole-line (Bug#3695).
Chong Yidong <cyd@stupidchicken.com>
parents: 103893
diff changeset
4789 (1+ (point))
a4d216dbf517 * simple.el (kill-visual-line): Obey kill-whole-line (Bug#3695).
Chong Yidong <cyd@stupidchicken.com>
parents: 103893
diff changeset
4790 (point)))))
96777
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4791
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4792 (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
4793 "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
4794 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
4795 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
4796 the variable `line-move-visual'."
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4797 (interactive "^p\np")
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4798 (let ((line-move-visual nil))
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4799 (with-no-warnings
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4800 (next-line arg try-vscroll))))
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4801
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4802 (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
4803 "Move cursor vertically up ARG lines.
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4804 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
4805 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
4806 the variable `line-move-visual'."
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4807 (interactive "^p\np")
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4808 (let ((line-move-visual nil))
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4809 (with-no-warnings
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4810 (previous-line arg try-vscroll))))
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4811
96843
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4812 (defgroup visual-line nil
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4813 "Editing based on visual lines."
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4814 :group 'convenience
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4815 :version "23.1")
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4816
96777
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4817 (defvar visual-line-mode-map
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4818 (let ((map (make-sparse-keymap)))
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4819 (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
4820 (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
4821 (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
4822 ;; 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
4823 ;; there any other suitable bindings?
47e78f883705 (visual-line-mode-map): Remove M-[ and M-] bindings.
Chong Yidong <cyd@stupidchicken.com>
parents: 100880
diff changeset
4824 ;; (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
4825 ;; (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
4826 map))
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4827
96843
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4828 (defcustom visual-line-fringe-indicators '(nil nil)
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4829 "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
4830 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
4831 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
4832 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
4833 See also `fringe-indicator-alist'.
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4834 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
4835 This variable does not affect fringe indicators displayed for
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4836 other purposes."
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4837 :type '(list (choice (const :tag "Hide left indicator" nil)
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4838 (const :tag "Left curly arrow" left-curly-arrow)
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4839 (symbol :tag "Other bitmap"))
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4840 (choice (const :tag "Hide right indicator" nil)
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4841 (const :tag "Right curly arrow" right-curly-arrow)
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4842 (symbol :tag "Other bitmap")))
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4843 :set (lambda (symbol value)
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4844 (dolist (buf (buffer-list))
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4845 (with-current-buffer buf
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4846 (when (and (boundp 'visual-line-mode)
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4847 (symbol-value 'visual-line-mode))
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4848 (setq fringe-indicator-alist
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4849 (cons (cons 'continuation value)
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4850 (assq-delete-all
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4851 'continuation
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4852 (copy-tree fringe-indicator-alist)))))))
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4853 (set-default symbol value)))
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4854
97437
c7a00c2c8219 (visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 97150
diff changeset
4855 (defvar visual-line--saved-state nil)
c7a00c2c8219 (visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 97150
diff changeset
4856
96777
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4857 (define-minor-mode visual-line-mode
96845
55273a37c1d5 (visual-line-mode): Add lighter.
Chong Yidong <cyd@stupidchicken.com>
parents: 96843
diff changeset
4858 "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
4859 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
4860 :keymap visual-line-mode-map
96843
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4861 :group 'visual-line
107079
4e5186e157d5 * simple.el (visual-line-mode): Capitalize lighter.
Glenn Morris <rgm@gnu.org>
parents: 106815
diff changeset
4862 :lighter " Wrap"
96777
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4863 (if visual-line-mode
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4864 (progn
97437
c7a00c2c8219 (visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 97150
diff changeset
4865 (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
4866 ;; 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
4867 ;; visual-line-mode is turned off.
c7a00c2c8219 (visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 97150
diff changeset
4868 (dolist (var '(line-move-visual truncate-lines
c7a00c2c8219 (visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 97150
diff changeset
4869 truncate-partial-width-windows
c7a00c2c8219 (visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 97150
diff changeset
4870 word-wrap fringe-indicator-alist))
c7a00c2c8219 (visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 97150
diff changeset
4871 (if (local-variable-p var)
97438
1d048637d408 Delete trailing whitespace.
Chong Yidong <cyd@stupidchicken.com>
parents: 97437
diff changeset
4872 (push (cons var (symbol-value var))
97437
c7a00c2c8219 (visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 97150
diff changeset
4873 visual-line--saved-state)))
96777
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4874 (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
4875 (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
4876 (setq truncate-lines nil
8683c121397c (visual-line-mode): Disable truncate-partial-width-windows.
Chong Yidong <cyd@stupidchicken.com>
parents: 96845
diff changeset
4877 word-wrap t
8683c121397c (visual-line-mode): Disable truncate-partial-width-windows.
Chong Yidong <cyd@stupidchicken.com>
parents: 96845
diff changeset
4878 fringe-indicator-alist
96843
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4879 (cons (cons 'continuation visual-line-fringe-indicators)
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4880 fringe-indicator-alist)))
96777
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4881 (kill-local-variable 'line-move-visual)
96843
cc8f5c6c468e (visual-line): New custom group.
Chong Yidong <cyd@stupidchicken.com>
parents: 96777
diff changeset
4882 (kill-local-variable 'word-wrap)
96874
8683c121397c (visual-line-mode): Disable truncate-partial-width-windows.
Chong Yidong <cyd@stupidchicken.com>
parents: 96845
diff changeset
4883 (kill-local-variable 'truncate-lines)
8683c121397c (visual-line-mode): Disable truncate-partial-width-windows.
Chong Yidong <cyd@stupidchicken.com>
parents: 96845
diff changeset
4884 (kill-local-variable 'truncate-partial-width-windows)
97437
c7a00c2c8219 (visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 97150
diff changeset
4885 (kill-local-variable 'fringe-indicator-alist)
c7a00c2c8219 (visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 97150
diff changeset
4886 (dolist (saved visual-line--saved-state)
c7a00c2c8219 (visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 97150
diff changeset
4887 (set (make-local-variable (car saved)) (cdr saved)))
c7a00c2c8219 (visual-line--saved-state): New var.
Chong Yidong <cyd@stupidchicken.com>
parents: 97150
diff changeset
4888 (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
4889
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4890 (defun turn-on-visual-line-mode ()
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4891 (visual-line-mode 1))
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4892
66c97af5f33c (line-move-visual): Make it a defcustom.
Chong Yidong <cyd@stupidchicken.com>
parents: 96675
diff changeset
4893 (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
4894 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
4895 :lighter " vl")
107875
b22d92cb789e Move scrolling commands from simple.el to window.el
Juri Linkov <juri@jurta.org>
parents: 107874
diff changeset
4896
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
4897
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4898 (defun transpose-chars (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4899 "Interchange characters around point, moving forward one character.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4900 With prefix arg ARG, effect is to take character before point
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4901 and drag it forward past ARG other characters (backward if ARG negative).
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4902 If no argument and at end of line, the previous two chars are exchanged."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4903 (interactive "*P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4904 (and (null arg) (eolp) (forward-char -1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4905 (transpose-subr 'forward-char (prefix-numeric-value arg)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4906
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4907 (defun transpose-words (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4908 "Interchange words around point, leaving point at end of them.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4909 With prefix arg ARG, effect is to take word before or around point
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4910 and drag it forward past ARG other words (backward if ARG negative).
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4911 If ARG is zero, the words around or after point and around or after mark
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4912 are interchanged."
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4913 ;; FIXME: `foo a!nd bar' should transpose into `bar and foo'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4914 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4915 (transpose-subr 'forward-word arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4916
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4917 (defun transpose-sexps (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4918 "Like \\[transpose-words] but applies to sexps.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4919 Does not work on a sexp that point is in the middle of
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4920 if it is a list or string."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4921 (interactive "*p")
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4922 (transpose-subr
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4923 (lambda (arg)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4924 ;; 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
4925 ;; (cons (progn (forward-sexp x) (point))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4926 ;; (progn (forward-sexp (- x)) (point)))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4927 ;; 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
4928 ;; 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
4929 ;; 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
4930 (if (if (> arg 0)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4931 (looking-at "\\sw\\|\\s_")
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4932 (and (not (bobp))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4933 (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
4934 ;; 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
4935 (progn (funcall (if (> arg 0)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4936 'skip-syntax-backward 'skip-syntax-forward)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4937 "w_")
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4938 (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
4939 ;; 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
4940 ;; 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
4941 ;; we're going.
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4942 (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
4943 (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
4944 (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
4945 (not (zerop (funcall (if (> arg 0)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4946 'skip-syntax-forward
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4947 'skip-syntax-backward)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4948 ".")))))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4949 (point)))))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4950 arg 'special))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4951
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4952 (defun transpose-lines (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4953 "Exchange current line and previous line, leaving point after both.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4954 With argument ARG, takes previous line and moves it past ARG lines.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4955 With argument 0, interchanges line point is in with line mark is in."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4956 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4957 (transpose-subr (function
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4958 (lambda (arg)
20465
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
4959 (if (> arg 0)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4960 (progn
20465
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
4961 ;; Move forward over ARG lines,
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
4962 ;; but create newlines if necessary.
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
4963 (setq arg (forward-line arg))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
4964 (if (/= (preceding-char) ?\n)
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
4965 (setq arg (1+ arg)))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
4966 (if (> arg 0)
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
4967 (newline arg)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4968 (forward-line arg))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4969 arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4970
107143
38f0f81b2f1f Improve docs of some transposition functions.
Glenn Morris <rgm@gnu.org>
parents: 107079
diff changeset
4971 ;; FIXME seems to leave point BEFORE the current object when ARG = 0,
38f0f81b2f1f Improve docs of some transposition functions.
Glenn Morris <rgm@gnu.org>
parents: 107079
diff changeset
4972 ;; which seems inconsistent with the ARG /= 0 case.
38f0f81b2f1f Improve docs of some transposition functions.
Glenn Morris <rgm@gnu.org>
parents: 107079
diff changeset
4973 ;; FIXME document SPECIAL.
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4974 (defun transpose-subr (mover arg &optional special)
107143
38f0f81b2f1f Improve docs of some transposition functions.
Glenn Morris <rgm@gnu.org>
parents: 107079
diff changeset
4975 "Subroutine to do the work of transposing objects.
38f0f81b2f1f Improve docs of some transposition functions.
Glenn Morris <rgm@gnu.org>
parents: 107079
diff changeset
4976 Works for lines, sentences, paragraphs, etc. MOVER is a function that
38f0f81b2f1f Improve docs of some transposition functions.
Glenn Morris <rgm@gnu.org>
parents: 107079
diff changeset
4977 moves forward by units of the given object (e.g. forward-sentence,
38f0f81b2f1f Improve docs of some transposition functions.
Glenn Morris <rgm@gnu.org>
parents: 107079
diff changeset
4978 forward-paragraph). If ARG is zero, exchanges the current object
38f0f81b2f1f Improve docs of some transposition functions.
Glenn Morris <rgm@gnu.org>
parents: 107079
diff changeset
4979 with the one containing mark. If ARG is an integer, moves the
38f0f81b2f1f Improve docs of some transposition functions.
Glenn Morris <rgm@gnu.org>
parents: 107079
diff changeset
4980 current object past ARG following (if ARG is positive) or
38f0f81b2f1f Improve docs of some transposition functions.
Glenn Morris <rgm@gnu.org>
parents: 107079
diff changeset
4981 preceding (if ARG is negative) objects, leaving point after the
38f0f81b2f1f Improve docs of some transposition functions.
Glenn Morris <rgm@gnu.org>
parents: 107079
diff changeset
4982 current object."
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4983 (let ((aux (if special mover
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4984 (lambda (x)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4985 (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
4986 (progn (funcall mover (- x)) (point))))))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4987 pos1 pos2)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4988 (cond
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4989 ((= arg 0)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4990 (save-excursion
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4991 (setq pos1 (funcall aux 1))
105771
92f6698524cd * simple.el (transpose-subr): Give clearer error when the mark is not set.
Juanma Barranquero <lekktu@gmail.com>
parents: 105715
diff changeset
4992 (goto-char (or (mark) (error "No mark set in this buffer")))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4993 (setq pos2 (funcall aux 1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4994 (transpose-subr-1 pos1 pos2))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4995 (exchange-point-and-mark))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4996 ((> arg 0)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4997 (setq pos1 (funcall aux -1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4998 (setq pos2 (funcall aux arg))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4999 (transpose-subr-1 pos1 pos2)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5000 (goto-char (car pos2)))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5001 (t
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5002 (setq pos1 (funcall aux -1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5003 (goto-char (car pos1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5004 (setq pos2 (funcall aux arg))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5005 (transpose-subr-1 pos1 pos2)))))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5006
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5007 (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
5008 (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
5009 (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
5010 (when (> (car pos1) (car pos2))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5011 (let ((swap pos1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5012 (setq pos1 pos2 pos2 swap)))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5013 (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
5014 (atomic-change-group
49ff3106980b (undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 43032
diff changeset
5015 (let (word2)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
5016 ;; 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
5017 ;; 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
5018 (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
5019 (goto-char (car pos2))
49ff3106980b (undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 43032
diff changeset
5020 (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
5021 (goto-char (car pos1))
49ff3106980b (undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 43032
diff changeset
5022 (insert word2))))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
5023
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
5024 (defun backward-word (&optional arg)
39110
9e2ff77fc88a (backward-word): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 39039
diff changeset
5025 "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
5026 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
5027 (interactive "^p")
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
5028 (forward-word (- (or arg 1))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5029
59178
abe8f4f2982c (mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents: 59162
diff changeset
5030 (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
5031 "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
5032 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
5033 move to with the same argument.
59178
abe8f4f2982c (mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents: 59162
diff changeset
5034 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
5035 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
5036 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
5037 (interactive "P\np")
abe8f4f2982c (mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents: 59162
diff changeset
5038 (cond ((and allow-extend
abe8f4f2982c (mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents: 59162
diff changeset
5039 (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
5040 (region-active-p)))
58917
44dfc09c6b67 * simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents: 58754
diff changeset
5041 (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
5042 (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
5043 (set-mark
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
5044 (save-excursion
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
5045 (goto-char (mark))
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
5046 (forward-word arg)
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
5047 (point))))
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
5048 (t
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
5049 (push-mark
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
5050 (save-excursion
58917
44dfc09c6b67 * simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents: 58754
diff changeset
5051 (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
5052 (point))
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
5053 nil t))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5054
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5055 (defun kill-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5056 "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
5057 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
5058 (interactive "p")
25400
c75839c09c84 (kill-word): Undo previous change.
Gerd Moellmann <gerd@gnu.org>
parents: 25342
diff changeset
5059 (kill-region (point) (progn (forward-word arg) (point))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5060
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5061 (defun backward-kill-word (arg)
75113
80f0c81302ab (backward-kill-word): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 74848
diff changeset
5062 "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
5063 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
5064 (interactive "p")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5065 (kill-word (- arg)))
2416
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
5066
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5067 (defun current-word (&optional strict really-word)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5068 "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
5069 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
5070 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
5071 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
5072 if there is no word nearby.
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5073 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
5074 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
5075 (save-excursion
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5076 (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
5077 (syntaxes (if really-word "w" "w_"))
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5078 (not-syntaxes (concat "^" syntaxes)))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5079 (skip-syntax-backward syntaxes) (setq start (point))
2416
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
5080 (goto-char oldpoint)
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5081 (skip-syntax-forward syntaxes) (setq end (point))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5082 (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
5083 ;; 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
5084 (not strict))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5085 ;; Look for preceding word in same line.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5086 (skip-syntax-backward not-syntaxes
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5087 (save-excursion (beginning-of-line)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5088 (point)))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5089 (if (bolp)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5090 ;; No preceding word in same line.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5091 ;; Look for following word in same line.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5092 (progn
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5093 (skip-syntax-forward not-syntaxes
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5094 (save-excursion (end-of-line)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5095 (point)))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5096 (setq start (point))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5097 (skip-syntax-forward syntaxes)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5098 (setq end (point)))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5099 (setq end (point))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5100 (skip-syntax-backward syntaxes)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5101 (setq start (point))))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5102 ;; 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
5103 (unless (= start end)
18379
1dd6f63f0ea3 (paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 18334
diff changeset
5104 (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
5105
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5106 (defcustom fill-prefix nil
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
5107 "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
5108 :type '(choice (const :tag "None" nil)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5109 string)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5110 :group 'fill)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5111 (make-variable-buffer-local 'fill-prefix)
92948
73a01bf5cb80 * faces.el (xw-defined-colors):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92715
diff changeset
5112 (put 'fill-prefix 'safe-local-variable 'string-or-null-p)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5113
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5114 (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
5115 "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
5116 :type '(choice (const :tag "None" nil)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5117 regexp)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5118 :group 'fill)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5119
21122
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
5120 ;; 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
5121 ;; 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
5122 ;; 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
5123 ;; (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
5124 ;; but this one is the default one.)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5125 (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
5126 (let (fc justify give-up
12708
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
5127 (fill-prefix fill-prefix))
10471
3eb77f03f53e (do-auto-fill): justification renamed to current-justification.
Richard M. Stallman <rms@gnu.org>
parents: 10469
diff changeset
5128 (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
5129 (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
5130 (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
5131 (<= (current-column) fc))
55699
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
5132 (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
5133 (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
5134 (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
5135 nil ;; Auto-filling not required
10813
bccf0295c66e (open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents: 10805
diff changeset
5136 (if (memq justify '(full center right))
bccf0295c66e (open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents: 10805
diff changeset
5137 (save-excursion (unjustify-current-line)))
12708
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
5138
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
5139 ;; 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
5140 (when (and adaptive-fill-mode
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5141 (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
5142 (let ((prefix
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5143 (fill-context-prefix
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5144 (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
5145 (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
5146 (and prefix (not (equal prefix ""))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5147 ;; 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
5148 (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
5149 (string-match "\\`[ \t]*\\'" prefix)))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5150 (setq fill-prefix prefix))))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
5151
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
5152 (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
5153 ;; 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
5154 (let* (after-prefix
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
5155 (fill-point
55699
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
5156 (save-excursion
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
5157 (beginning-of-line)
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
5158 (setq after-prefix (point))
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
5159 (and fill-prefix
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
5160 (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
5161 (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
5162 (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
5163 (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
5164 (point))))
19343
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
5165
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
5166 ;; 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
5167 (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
5168 (goto-char fill-point)
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5169 (or (bolp)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5170 ;; 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
5171 (save-excursion (skip-chars-forward " ") (eolp))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5172 ;; 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
5173 ;; 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
5174 (and after-prefix (<= (point) after-prefix))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5175 ;; 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
5176 ;; 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
5177 (and comment-start-skip
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5178 (let ((limit (point)))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5179 (beginning-of-line)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5180 (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
5181 limit t)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5182 (eq (point) limit))))))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5183 ;; 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
5184 (setq give-up t)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5185 ;; 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
5186 (let ((prev-column (current-column)))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5187 ;; 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
5188 ;; 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
5189 ;; 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
5190 (if (save-excursion
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5191 (skip-chars-backward " \t")
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5192 (= (point) fill-point))
82303
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5193 (default-indent-new-line t)
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5194 (save-excursion
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5195 (goto-char fill-point)
82303
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5196 (default-indent-new-line t)))
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5197 ;; Now do justification, if required
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5198 (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
5199 (save-excursion
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5200 (end-of-line 0)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5201 (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
5202 ;; 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
5203 ;; 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
5204 ;; trying again will not help.
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5205 (if (>= (current-column) prev-column)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
5206 (setq give-up t))))))
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
5207 ;; Justify last line.
15263
0d7899c372ed (do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents: 15115
diff changeset
5208 (justify-current-line justify t t)
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
5209 t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5210
82303
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5211 (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
5212 "*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
5213 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
5214 is defined.
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5215 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
5216 indicating whether it should use soft newlines.")
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5217
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5218 (defun default-indent-new-line (&optional soft)
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5219 "Break line at point and indent.
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5220 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
5221
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5222 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
5223 unless optional argument SOFT is non-nil."
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5224 (interactive)
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5225 (if comment-start
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5226 (funcall comment-line-break-function soft)
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5227 ;; 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
5228 ;; get preserved better.
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5229 (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
5230 (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
5231 (delete-horizontal-space)
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5232
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5233 (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
5234 ;; Blindly trust a non-adaptive fill-prefix.
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5235 (progn
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5236 (indent-to-left-margin)
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5237 (insert-before-markers-and-inherit fill-prefix))
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5238
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5239 (cond
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5240 ;; 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
5241 ;; 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
5242 (fill-prefix
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5243 (indent-to-left-margin)
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5244 (insert-and-inherit fill-prefix))
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5245 ;; 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
5246 (t (indent-according-to-mode))))))
76cd87e9edd6 (default-indent-new-line): New function.
Richard M. Stallman <rms@gnu.org>
parents: 82140
diff changeset
5247
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
5248 (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
5249 "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
5250 Some major modes set this.")
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
5251
60645
b532848a1806 (auto-fill-function): Use the new :minor-mode-function property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60619
diff changeset
5252 (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
5253 ;; `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
5254 ;; 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
5255 ;; 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
5256 (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
5257 ;; 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
5258 ;; Add a global minor mode version of it.
108242
dc6153a5f4f7 Use define-minor-mode in more cases.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108212
diff changeset
5259 (define-minor-mode auto-fill-mode
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
5260 "Toggle Auto Fill mode.
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
5261 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
5262 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
5263 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
5264
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
5265 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
5266 for `auto-fill-function' when turning Auto Fill mode on."
108242
dc6153a5f4f7 Use define-minor-mode in more cases.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108212
diff changeset
5267 :variable (eq auto-fill-function normal-auto-fill-function))
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
5268
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
5269 ;; 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
5270 (defun auto-fill-function ()
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
5271 "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
5272 nil)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
5273
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
5274 (defun turn-on-auto-fill ()
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
5275 "Unconditionally turn on Auto Fill mode."
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
5276 (auto-fill-mode 1))
29808
fa2c8534a53a (turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29345
diff changeset
5277
fa2c8534a53a (turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29345
diff changeset
5278 (defun turn-off-auto-fill ()
fa2c8534a53a (turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29345
diff changeset
5279 "Unconditionally turn off Auto Fill mode."
fa2c8534a53a (turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29345
diff changeset
5280 (auto-fill-mode -1))
fa2c8534a53a (turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29345
diff changeset
5281
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
5282 (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
5283
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
5284 (defun set-fill-column (arg)
15431
68cca71d69bd (set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents: 15305
diff changeset
5285 "Set `fill-column' to specified argument.
23447
7ccd43d053fd (set-fill-column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23251
diff changeset
5286 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
5287 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
5288 (interactive
3f94f995598c (set-fill-column): Prompt rather than error by default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93609
diff changeset
5289 (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
5290 ;; 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
5291 ;; 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
5292 ;; now an interactive prompt.
3f94f995598c (set-fill-column): Prompt rather than error by default.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93609
diff changeset
5293 (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
5294 (if (consp arg)
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
5295 (setq arg (current-column)))
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
5296 (if (not (integerp arg))
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
5297 ;; 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
5298 (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
5299 (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
5300 (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
5301
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5302 (defun set-selective-display (arg)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
5303 "Set `selective-display' to ARG; clear it if no arg.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
5304 When the value of `selective-display' is a number > 0,
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
5305 lines whose indentation is >= that value are not displayed.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
5306 The variable `selective-display' has a separate value for each buffer."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5307 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5308 (if (eq selective-display t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5309 (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
5310 (let ((current-vpos
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
5311 (save-restriction
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
5312 (narrow-to-region (point-min) (point))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
5313 (goto-char (window-start))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
5314 (vertical-motion (window-height)))))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
5315 (setq selective-display
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
5316 (and arg (prefix-numeric-value arg)))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
5317 (recenter current-vpos))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5318 (set-window-start (selected-window) (window-start (selected-window)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5319 (princ "selective-display set to " t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5320 (prin1 selective-display t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5321 (princ "." t))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5322
48406
e670dd0e8087 (indicate-unused-lines, default-indicate-unused-lines): New variable aliases.
Richard M. Stallman <rms@gnu.org>
parents: 48234
diff changeset
5323 (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
5324
70959
23bc72ff5e31 (toggle-truncate-lines): Make arg optional for
Reiner Steib <Reiner.Steib@gmx.de>
parents: 70842
diff changeset
5325 (defun toggle-truncate-lines (&optional arg)
74392
391c63d1de1c (toggle-truncate-lines): Clarify doc string.
Nick Roberts <nickrob@snap.net.nz>
parents: 74283
diff changeset
5326 "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
5327 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
5328 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
5329 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
5330 is non-nil."
46175
9fa0c9140afa 2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 46092
diff changeset
5331 (interactive "P")
9fa0c9140afa 2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 46092
diff changeset
5332 (setq truncate-lines
9fa0c9140afa 2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 46092
diff changeset
5333 (if (null arg)
9fa0c9140afa 2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 46092
diff changeset
5334 (not truncate-lines)
46872
543ab39f153c (toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents: 46845
diff changeset
5335 (> (prefix-numeric-value arg) 0)))
543ab39f153c (toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents: 46845
diff changeset
5336 (force-mode-line-update)
48013
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
5337 (unless truncate-lines
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
5338 (let ((buffer (current-buffer)))
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
5339 (walk-windows (lambda (window)
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
5340 (if (eq buffer (window-buffer window))
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
5341 (set-window-hscroll window 0)))
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
5342 nil t)))
46872
543ab39f153c (toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents: 46845
diff changeset
5343 (message "Truncate long lines %s"
543ab39f153c (toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents: 46845
diff changeset
5344 (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
5345
101897
d08c7c69fefe (toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents: 101849
diff changeset
5346 (defun toggle-word-wrap (&optional arg)
d08c7c69fefe (toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents: 101849
diff changeset
5347 "Toggle whether to use word-wrapping for continuation lines.
d08c7c69fefe (toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents: 101849
diff changeset
5348 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
5349 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
5350 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
5351 if long lines are truncated."
d08c7c69fefe (toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents: 101849
diff changeset
5352 (interactive "P")
d08c7c69fefe (toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents: 101849
diff changeset
5353 (setq word-wrap
d08c7c69fefe (toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents: 101849
diff changeset
5354 (if (null arg)
d08c7c69fefe (toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents: 101849
diff changeset
5355 (not word-wrap)
d08c7c69fefe (toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents: 101849
diff changeset
5356 (> (prefix-numeric-value arg) 0)))
d08c7c69fefe (toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents: 101849
diff changeset
5357 (force-mode-line-update)
d08c7c69fefe (toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents: 101849
diff changeset
5358 (message "Word wrapping %s"
d08c7c69fefe (toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents: 101849
diff changeset
5359 (if word-wrap "enabled" "disabled")))
d08c7c69fefe (toggle-word-wrap): New command.
Juri Linkov <juri@jurta.org>
parents: 101849
diff changeset
5360
105798
0ad1fc06bfc8 * puresize.h (BASE_PURESIZE): Increase to 1470000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105771
diff changeset
5361 (defvar overwrite-mode-textual (purecopy " Ovwrt")
2215
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
5362 "The string displayed in the mode line when in overwrite mode.")
105798
0ad1fc06bfc8 * puresize.h (BASE_PURESIZE): Increase to 1470000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105771
diff changeset
5363 (defvar overwrite-mode-binary (purecopy " 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
5364 "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
5365
108242
dc6153a5f4f7 Use define-minor-mode in more cases.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108212
diff changeset
5366 (define-minor-mode overwrite-mode
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5367 "Toggle overwrite mode.
78492
7c8949dbfa0d Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents: 78236
diff changeset
5368 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
5369 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
5370 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
5371 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
5372 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
5373 \\[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
5374 is supposed to make it easier to insert characters when necessary."
108242
dc6153a5f4f7 Use define-minor-mode in more cases.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108212
diff changeset
5375 :variable (eq overwrite-mode 'overwrite-mode-textual))
dc6153a5f4f7 Use define-minor-mode in more cases.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108212
diff changeset
5376
dc6153a5f4f7 Use define-minor-mode in more cases.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108212
diff changeset
5377 (define-minor-mode binary-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
5378 "Toggle binary overwrite mode.
78492
7c8949dbfa0d Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents: 78236
diff changeset
5379 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
5380 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
5381 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
5382 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
5383 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
5384 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
5385 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
5386
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
5387 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
5388 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
5389 `overwrite-mode' variable to `overwrite-mode-binary'."
108242
dc6153a5f4f7 Use define-minor-mode in more cases.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108212
diff changeset
5390 :variable (eq overwrite-mode 'overwrite-mode-binary))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
5391
47408
2239db3433ca (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47364
diff changeset
5392 (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
5393 "Toggle Line Number mode.
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
5394 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
5395 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
5396 appears in the mode line.
23660
68edff9e7389 (line-number-mode): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23588
diff changeset
5397
38908
f917490db0d6 (line-number-mode): Mention the variable line-number-display-limit-width
Eli Zaretskii <eliz@gnu.org>
parents: 38847
diff changeset
5398 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
5399 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
5400 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
5401 :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
5402
2239db3433ca (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47364
diff changeset
5403 (define-minor-mode column-number-mode
12565
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
5404 "Toggle Column Number mode.
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
5405 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
5406 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
5407 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
5408 :global t :group 'mode-line)
52464
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
5409
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
5410 (define-minor-mode size-indication-mode
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
5411 "Toggle Size Indication mode.
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
5412 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
5413 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
5414 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
5415 :global t :group 'mode-line)
108296
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5416
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5417 (define-minor-mode auto-save-mode
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5418 "Toggle auto-saving of contents of current buffer.
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5419 With prefix argument ARG, turn auto-saving on if positive, else off."
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5420 :variable ((and buffer-auto-save-file-name
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5421 ;; If auto-save is off because buffer has shrunk,
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5422 ;; then toggling should turn it on.
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5423 (>= buffer-saved-size 0))
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5424 . (lambda (val)
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5425 (setq buffer-auto-save-file-name
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5426 (cond
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5427 ((null val) nil)
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5428 ((and buffer-file-name auto-save-visited-file-name
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5429 (not buffer-read-only))
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5430 buffer-file-name)
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5431 (t (make-auto-save-file-name))))))
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5432 ;; If -1 was stored here, to temporarily turn off saving,
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5433 ;; turn it back on.
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5434 (and (< buffer-saved-size 0)
d46fdf06e110 * files.el (auto-save-mode): Move to simple.el to fix bootstrap.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108242
diff changeset
5435 (setq buffer-saved-size 0)))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
5436
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
5437 (defgroup paren-blinking nil
18379
1dd6f63f0ea3 (paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 18334
diff changeset
5438 "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
5439 :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
5440 :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
5441
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5442 (defcustom blink-matching-paren t
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
5443 "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
5444 :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
5445 :group 'paren-blinking)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5446
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5447 (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
5448 "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
5449 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
5450 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
5451
67154
a90e7f4f4c45 (blink-matching-paren-on-screen): Further doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 67152
diff changeset
5452 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
5453 \(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
5454 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
5455 :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
5456 :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
5457
104023
afb0c07ee9cb (blink-matching-paren-distance): Bump to 100k. (Bug#3889)
Glenn Morris <rgm@gnu.org>
parents: 103977
diff changeset
5458 (defcustom blink-matching-paren-distance (* 100 1024)
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
5459 "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
5460 If nil, search stops at the beginning of the accessible portion of the buffer."
104023
afb0c07ee9cb (blink-matching-paren-distance): Bump to 100k. (Bug#3889)
Glenn Morris <rgm@gnu.org>
parents: 103977
diff changeset
5461 :version "23.2" ; 25->100k
65173
9398f33d6515 (blink-matching-paren-distance): Document the meaning of nil value,
Eli Zaretskii <eliz@gnu.org>
parents: 64991
diff changeset
5462 :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
5463 :group 'paren-blinking)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5464
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5465 (defcustom blink-matching-delay 1
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
5466 "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
5467 :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
5468 :group 'paren-blinking)
9771
3a51735d4a55 (blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9750
diff changeset
5469
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5470 (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
5471 "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
5472 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
5473 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
5474 :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
5475 :group 'paren-blinking)
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
5476
110155
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5477 (defun blink-matching-check-mismatch (start end)
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5478 "Return whether or not START...END are matching parens.
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5479 END is the current point and START is the blink position.
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5480 START might be nil if no matching starter was found.
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5481 Returns non-nil if we find there is a mismatch."
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5482 (let* ((end-syntax (syntax-after (1- end)))
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5483 (matching-paren (and (consp end-syntax)
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5484 (eq (syntax-class end-syntax) 5)
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5485 (cdr end-syntax))))
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5486 ;; For self-matched chars like " and $, we can't know when they're
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5487 ;; mismatched or unmatched, so we can only do it for parens.
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5488 (when matching-paren
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5489 (not (and start
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5490 (or
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5491 (eq (char-after start) matching-paren)
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5492 ;; The cdr might hold a new paren-class info rather than
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5493 ;; a matching-char info, in which case the two CDRs
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5494 ;; should match.
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5495 (eq matching-paren (cdr-safe (syntax-after start)))))))))
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5496
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5497 (defvar blink-matching-check-function #'blink-matching-check-mismatch
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5498 "Function to check parentheses mismatches.
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5499 The function takes two arguments (START and END) where START is the
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5500 position just before the opening token and END is the position right after.
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5501 START can be nil, if it was not found.
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5502 The function should return non-nil if the two tokens do not match.")
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5503
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5504 (defun blink-matching-open ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5505 "Move cursor momentarily to the beginning of the sexp before point."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5506 (interactive)
110155
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5507 (when (and (not (bobp))
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5508 blink-matching-paren)
65377
745b7454f9cc (blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents: 65295
diff changeset
5509 (let* ((oldpos (point))
110155
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5510 (message-log-max nil) ; Don't log messages about paren matching.
84609
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5511 (blinkpos
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5512 (save-excursion
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5513 (save-restriction
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5514 (if blink-matching-paren-distance
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5515 (narrow-to-region
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5516 (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
5517 (- (point) blink-matching-paren-distance))
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5518 oldpos))
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5519 (let ((parse-sexp-ignore-comments
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5520 (and parse-sexp-ignore-comments
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5521 (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
5522 (condition-case ()
109879
c39af0d0a834 * lisp/simple.el (blink-matching-open): Obey forward-sexp-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109846
diff changeset
5523 (progn
c39af0d0a834 * lisp/simple.el (blink-matching-open): Obey forward-sexp-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109846
diff changeset
5524 (forward-sexp -1)
110155
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5525 ;; backward-sexp skips backward over prefix chars,
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5526 ;; so move back to the matching paren.
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5527 (while (and (< (point) (1- oldpos))
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5528 (let ((code (car (syntax-after (point)))))
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5529 (or (eq (logand 65536 code) 6)
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5530 (eq (logand 1048576 code) 1048576))))
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5531 (forward-char 1))
109879
c39af0d0a834 * lisp/simple.el (blink-matching-open): Obey forward-sexp-function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 109846
diff changeset
5532 (point))
84609
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5533 (error nil))))))
110155
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5534 (mismatch (funcall blink-matching-check-function blinkpos oldpos)))
84609
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5535 (cond
110155
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5536 (mismatch
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5537 (if blinkpos
101181
a0e232b151fb (blink-matching-open): Use `minibuffer-message' to
Juri Linkov <juri@jurta.org>
parents: 101010
diff changeset
5538 (if (minibufferp)
110155
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5539 (minibuffer-message " [Mismatched parentheses]")
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5540 (message "Mismatched parentheses"))
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5541 (if (minibufferp)
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5542 (minibuffer-message " [Unmatched parenthesis]")
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5543 (message "Unmatched parenthesis"))))
84609
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5544 ((pos-visible-in-window-p blinkpos)
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5545 ;; 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
5546 ;; 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
5547 (and blink-matching-paren-on-screen
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5548 (not show-paren-mode)
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5549 (save-excursion
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5550 (goto-char blinkpos)
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5551 (sit-for blink-matching-delay))))
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5552 (t
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5553 (save-excursion
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5554 (goto-char blinkpos)
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5555 (let ((open-paren-line-string
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5556 ;; 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
5557 (cond
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5558 ((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
5559 (buffer-substring (line-beginning-position)
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5560 (1+ blinkpos)))
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5561 ;; 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
5562 ((save-excursion
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5563 (forward-char 1)
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5564 (skip-chars-forward " \t")
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5565 (not (eolp)))
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5566 (buffer-substring blinkpos
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5567 (line-end-position)))
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5568 ;; Otherwise show the previous nonblank line,
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5569 ;; if there is one.
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5570 ((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
5571 (concat
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5572 (buffer-substring (progn
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5573 (skip-chars-backward "\n \t")
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5574 (line-beginning-position))
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5575 (progn (end-of-line)
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5576 (skip-chars-backward " \t")
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5577 (point)))
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5578 ;; 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
5579 "..."
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5580 (buffer-substring blinkpos (1+ blinkpos))))
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5581 ;; 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
5582 (t (buffer-substring blinkpos (1+ blinkpos))))))
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5583 (message "Matches %s"
653c328271e7 (newline): Simplify use of prefix-numeric-value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84381
diff changeset
5584 (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
5585
110088
8102180db0fb * lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110015
diff changeset
5586 (defvar blink-paren-function 'blink-matching-open
8102180db0fb * lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110015
diff changeset
5587 "Function called, if non-nil, whenever a close parenthesis is inserted.
8102180db0fb * lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110015
diff changeset
5588 More precisely, a char with closeparen syntax is self-inserted.")
8102180db0fb * lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110015
diff changeset
5589
8102180db0fb * lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110015
diff changeset
5590 (defun blink-paren-post-self-insert-function ()
8102180db0fb * lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110015
diff changeset
5591 (when (and (eq (char-before) last-command-event) ; Sanity check.
8102180db0fb * lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110015
diff changeset
5592 (memq (char-syntax last-command-event) '(?\) ?\$))
8102180db0fb * lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110015
diff changeset
5593 blink-paren-function
8102180db0fb * lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110015
diff changeset
5594 (not executing-kbd-macro)
110155
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5595 (not noninteractive)
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5596 ;; Verify an even number of quoting characters precede the close.
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5597 (= 1 (logand 1 (- (point)
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5598 (save-excursion
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5599 (forward-char -1)
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5600 (skip-syntax-backward "/\\")
c62c9d6b8eef Add blink-matching-check-function and misc cleanups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110150
diff changeset
5601 (point))))))
110088
8102180db0fb * lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110015
diff changeset
5602 (funcall blink-paren-function)))
8102180db0fb * lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110015
diff changeset
5603
8102180db0fb * lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110015
diff changeset
5604 (add-hook 'post-self-insert-hook #'blink-paren-post-self-insert-function
8102180db0fb * lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110015
diff changeset
5605 ;; Most likely, this hook is nil, so this arg doesn't matter,
8102180db0fb * lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110015
diff changeset
5606 ;; but I use it as a reminder that this function usually
8102180db0fb * lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110015
diff changeset
5607 ;; likes to be run after others since it does `sit-for'.
8102180db0fb * lisp/simple.el (blink-paren-function): Move from C to here.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 110015
diff changeset
5608 'append)
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
5609
2805
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
5610 ;; 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
5611 ;; 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
5612 ;; that happens in the QUIT macro at the C code level.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5613 (defun keyboard-quit ()
22304
f322afba9154 (keyboard-quit): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 22257
diff changeset
5614 "Signal a `quit' condition.
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
5615 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
5616 At top-level, as an editor command, this simply beeps."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5617 (interactive)
109678
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
5618 ;; Avoid adding the region to the window selection.
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
5619 (setq saved-region-selection nil)
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
5620 (let (select-active-regions)
14830418f9fc Change `select-active-region' mechanics.
Chong Yidong <cyd@stupidchicken.com>
parents: 109676
diff changeset
5621 (deactivate-mark))
57853
d50014ac219f (keyboard-quit): Call kmacro-keyboard-quit.
Kim F. Storm <storm@cua.dk>
parents: 57688
diff changeset
5622 (if (fboundp 'kmacro-keyboard-quit)
d50014ac219f (keyboard-quit): Call kmacro-keyboard-quit.
Kim F. Storm <storm@cua.dk>
parents: 57688
diff changeset
5623 (kmacro-keyboard-quit))
47353
6979a589f9c7 (keyboard-quit): Set defining-kbd-macro to nil to
Kim F. Storm <storm@cua.dk>
parents: 47346
diff changeset
5624 (setq defining-kbd-macro nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5625 (signal 'quit nil))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5626
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
5627 (defvar buffer-quit-function nil
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
5628 "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
5629 \\[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
5630 \(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
5631
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
5632 (defun keyboard-escape-quit ()
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
5633 "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
5634 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
5635 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
5636 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
5637 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
5638 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
5639 (interactive)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
5640 (cond ((eq last-command 'mode-exited) nil)
107720
f0a2ddb8569a * simple.el (keyboard-escape-quit): Raise deselecting the active
Juri Linkov <juri@jurta.org>
parents: 107710
diff changeset
5641 ((region-active-p)
f0a2ddb8569a * simple.el (keyboard-escape-quit): Raise deselecting the active
Juri Linkov <juri@jurta.org>
parents: 107710
diff changeset
5642 (deactivate-mark))
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
5643 ((> (minibuffer-depth) 0)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
5644 (abort-recursive-edit))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
5645 (current-prefix-arg
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
5646 nil)
17355
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
5647 ((> (recursion-depth) 0)
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
5648 (exit-recursive-edit))
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
5649 (buffer-quit-function
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
5650 (funcall buffer-quit-function))
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
5651 ((not (one-window-p t))
17355
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
5652 (delete-other-windows))
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
5653 ((string-match "^ \\*" (buffer-name (current-buffer)))
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
5654 (bury-buffer))))
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
5655
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
5656 (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
5657 "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
5658 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
5659 specification for `play-sound'."
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
5660 (interactive "fPlay sound file: ")
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
5661 (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
5662 (if volume
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
5663 (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
5664 (if device
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
5665 (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
5666 (push 'sound sound)
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
5667 (play-sound sound)))
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
5668
59567
638fd0a9f545 (just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents: 59486
diff changeset
5669
27234
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
5670 (defcustom read-mail-command 'rmail
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
5671 "Your preference for a mail reading package.
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
5672 This is used by some keybindings which support reading mail.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
5673 See also `mail-user-agent' concerning sending mail."
106003
acba2c6db48c (x-selection-owner-p): Declare.
Glenn Morris <rgm@gnu.org>
parents: 105994
diff changeset
5674 :type '(radio (function-item :tag "Rmail" :format "%t\n" rmail)
acba2c6db48c (x-selection-owner-p): Declare.
Glenn Morris <rgm@gnu.org>
parents: 105994
diff changeset
5675 (function-item :tag "Gnus" :format "%t\n" gnus)
acba2c6db48c (x-selection-owner-p): Declare.
Glenn Morris <rgm@gnu.org>
parents: 105994
diff changeset
5676 (function-item :tag "Emacs interface to MH"
acba2c6db48c (x-selection-owner-p): Declare.
Glenn Morris <rgm@gnu.org>
parents: 105994
diff changeset
5677 :format "%t\n" mh-rmail)
acba2c6db48c (x-selection-owner-p): Declare.
Glenn Morris <rgm@gnu.org>
parents: 105994
diff changeset
5678 (function :tag "Other"))
27234
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
5679 :version "21.1"
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
5680 :group 'mail)
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
5681
103892
687539bbd810 (mail-user-agent): Default to the upwardly-UI-compatible
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103862
diff changeset
5682 (defcustom mail-user-agent 'message-user-agent
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
5683 "Your preference for a mail composition package.
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
5684 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
5685 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
5686 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
5687
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
5688 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
5689
103977
64c2a1f8f15d (mail-user-agent): Doc fix. Set :version tag.
Glenn Morris <rgm@gnu.org>
parents: 103961
diff changeset
5690 `message-user-agent' -- use the Message package.
64c2a1f8f15d (mail-user-agent): Doc fix. Set :version tag.
Glenn Morris <rgm@gnu.org>
parents: 103961
diff changeset
5691 See Info node `(message)'.
64c2a1f8f15d (mail-user-agent): Doc fix. Set :version tag.
Glenn Morris <rgm@gnu.org>
parents: 103961
diff changeset
5692 `sendmail-user-agent' -- use the Mail package.
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
5693 See Info node `(emacs)Sending Mail'.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
5694 `mh-e-user-agent' -- use the Emacs interface to the MH mail system.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
5695 See Info node `(mh-e)'.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
5696 `gnus-user-agent' -- like `message-user-agent', but with Gnus
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
5697 paraphernalia, particularly the Gcc: header for
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
5698 archiving.
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
5699
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
5700 Additional valid symbols may be available; check with the author of
34687
48e5a31a2ff0 (mail-user-agent): Doc fix.
Dave Love <fx@gnu.org>
parents: 34619
diff changeset
5701 your package for details. The function should return non-nil if it
48e5a31a2ff0 (mail-user-agent): Doc fix.
Dave Love <fx@gnu.org>
parents: 34619
diff changeset
5702 succeeds.
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
5703
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
5704 See also `read-mail-command' concerning reading mail."
103977
64c2a1f8f15d (mail-user-agent): Doc fix. Set :version tag.
Glenn Morris <rgm@gnu.org>
parents: 103961
diff changeset
5705 :type '(radio (function-item :tag "Message package"
64c2a1f8f15d (mail-user-agent): Doc fix. Set :version tag.
Glenn Morris <rgm@gnu.org>
parents: 103961
diff changeset
5706 :format "%t\n"
64c2a1f8f15d (mail-user-agent): Doc fix. Set :version tag.
Glenn Morris <rgm@gnu.org>
parents: 103961
diff changeset
5707 message-user-agent)
64c2a1f8f15d (mail-user-agent): Doc fix. Set :version tag.
Glenn Morris <rgm@gnu.org>
parents: 103961
diff changeset
5708 (function-item :tag "Mail package"
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5709 :format "%t\n"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5710 sendmail-user-agent)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5711 (function-item :tag "Emacs interface to MH"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5712 :format "%t\n"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5713 mh-e-user-agent)
103977
64c2a1f8f15d (mail-user-agent): Doc fix. Set :version tag.
Glenn Morris <rgm@gnu.org>
parents: 103961
diff changeset
5714 (function-item :tag "Message with full Gnus features"
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
5715 :format "%t\n"
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
5716 gnus-user-agent)
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5717 (function :tag "Other"))
103977
64c2a1f8f15d (mail-user-agent): Doc fix. Set :version tag.
Glenn Morris <rgm@gnu.org>
parents: 103961
diff changeset
5718 :version "23.2" ; sendmail->message
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5719 :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
5720
106473
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5721 (defcustom compose-mail-user-agent-warnings t
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5722 "If non-nil, `compose-mail' warns about changes in `mail-user-agent'.
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5723 If the value of `mail-user-agent' is the default, and the user
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5724 appears to have customizations applying to the old default,
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5725 `compose-mail' issues a warning."
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5726 :type 'boolean
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5727 :version "23.2"
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5728 :group 'mail)
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5729
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
5730 (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
5731 '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
5732 '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
5733
21906
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
5734 (defun rfc822-goto-eoh ()
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
5735 ;; 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
5736 (goto-char (point-min))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5737 (when (re-search-forward
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5738 "^\\([:\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
5739 (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
5740
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
5741 (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
5742 switch-function yank-action
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
5743 send-actions)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
5744 (if switch-function
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
5745 (let ((special-display-buffer-names nil)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
5746 (special-display-regexps nil)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
5747 (same-window-buffer-names nil)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
5748 (same-window-regexps nil))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
5749 (funcall switch-function "*mail*")))
53411
f0c057d16a15 (sendmail-user-agent-compose): Use assoc-string.
Richard M. Stallman <rms@gnu.org>
parents: 53097
diff changeset
5750 (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
5751 (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
5752 (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
5753 (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
5754 continue
4de96b605e55 2005-09-15 Chong Yidong <cyd@stupidchicken.com>
Chong Yidong <cyd@stupidchicken.com>
parents: 65482
diff changeset
5755 (error "Message aborted"))
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
5756 (save-excursion
21906
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
5757 (rfc822-goto-eoh)
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
5758 (while other-headers
28491
3e21859cd0e7 (sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents: 28193
diff changeset
5759 (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
5760 '("in-reply-to" "cc" "body"))
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
5761 (insert (car (car other-headers)) ": "
67213
818361523ce8 * longlines.el (longlines-mode): Add mail-setup-hook.
Chong Yidong <cyd@stupidchicken.com>
parents: 67181
diff changeset
5762 (cdr (car other-headers))
818361523ce8 * longlines.el (longlines-mode): Add mail-setup-hook.
Chong Yidong <cyd@stupidchicken.com>
parents: 67181
diff changeset
5763 (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
5764 (setq other-headers (cdr other-headers)))
28491
3e21859cd0e7 (sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents: 28193
diff changeset
5765 (when body
3e21859cd0e7 (sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents: 28193
diff changeset
5766 (forward-line 1)
3e21859cd0e7 (sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents: 28193
diff changeset
5767 (insert body))
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
5768 t)))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
5769
16632
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
5770 (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
5771 switch-function yank-action send-actions)
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
5772 "Start composing a mail message to send.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
5773 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
5774 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
5775 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
5776 and the initial Subject field, respectively.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
5777
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
5778 OTHER-HEADERS is an alist specifying additional
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
5779 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
5780 HEADER and VALUE are strings.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
5781
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
5782 CONTINUE, if non-nil, says to continue editing a message already
102467
f12ab46082b4 (compose-mail): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 102264
diff changeset
5783 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
5784
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
5785 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
5786 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
5787
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
5788 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
5789 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
5790 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
5791 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
5792 \(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
5793 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
5794
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
5795 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
5796 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
5797 (interactive
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
5798 (list nil nil nil current-prefix-arg))
106473
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5799
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5800 ;; In Emacs 23.2, the default value of `mail-user-agent' changed
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5801 ;; from sendmail-user-agent to message-user-agent. Some users may
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5802 ;; encounter incompatibilities. This hack tries to detect problems
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5803 ;; and warn about them.
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5804 (and compose-mail-user-agent-warnings
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5805 (eq mail-user-agent 'message-user-agent)
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5806 (let (warn-vars)
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5807 (dolist (var '(mail-mode-hook mail-send-hook mail-setup-hook
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5808 mail-yank-hooks mail-archive-file-name
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5809 mail-default-reply-to mail-mailing-lists
106553
bcddf97246ac * simple.el (compose-mail): Remove mail-setup-with-from from
Chong Yidong <cyd@stupidchicken.com>
parents: 106473
diff changeset
5810 mail-self-blind))
106473
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5811 (and (boundp var)
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5812 (symbol-value var)
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5813 (push var warn-vars)))
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5814 (when warn-vars
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5815 (display-warning 'mail
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5816 (format "\
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5817 The default mail mode is now Message mode.
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5818 You have the following Mail mode variable%s customized:
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5819 \n %s\n\nTo use Mail mode, set `mail-user-agent' to sendmail-user-agent.
109266
9df40307a957 Backport from trunk: doc fix.
Glenn Morris <rgm@gnu.org>
parents: 107670
diff changeset
5820 To disable this warning, set `compose-mail-user-agent-warnings' to nil."
106473
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5821 (if (> (length warn-vars) 1) "s" "")
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5822 (mapconcat 'symbol-name
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5823 warn-vars " "))))))
dfb27937da01 * simple.el (compose-mail): Check for incompatibilities and warn.
Chong Yidong <cyd@stupidchicken.com>
parents: 106459
diff changeset
5824
76785
bb2e03ff11bc (next-error-highlight): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 76634
diff changeset
5825 (let ((function (get mail-user-agent 'composefunc)))
bb2e03ff11bc (next-error-highlight): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 76634
diff changeset
5826 (funcall function to subject other-headers continue
bb2e03ff11bc (next-error-highlight): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 76634
diff changeset
5827 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
5828
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
5829 (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
5830 yank-action send-actions)
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
5831 "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
5832 (interactive
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
5833 (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
5834 (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
5835 '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
5836
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
5837
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
5838 (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
5839 yank-action send-actions)
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
5840 "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
5841 (interactive
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
5842 (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
5843 (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
5844 '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
5845
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
5846 (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
5847 "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
5848
a00fd366de50 (set-variable-value-history): Add reference to history-length in
Eli Zaretskii <eliz@gnu.org>
parents: 79598
diff changeset
5849 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
5850 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
5851
63717
2bd9653ec2f2 (set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 63595
diff changeset
5852 (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
5853 "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
5854 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
5855 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
5856 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
5857 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
5858
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
5859 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
5860 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
5861
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
5862 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
5863 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
5864
e06b5768debd (set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents: 46647
diff changeset
5865 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
5866 (interactive
7c92848a9d80 (set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents: 22144
diff changeset
5867 (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
5868 (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
5869 (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
5870 default-var)
3213e48ea8b3 (set-variable): Use user-variable-p instead of symbolp.
Juri Linkov <juri@jurta.org>
parents: 66114
diff changeset
5871 (read-variable "Set variable: ")))
53097
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
5872 (minibuffer-help-form '(describe-variable var))
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
5873 (prop (get var 'variable-interactive))
63866
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5874 (obsolete (car (get var 'byte-obsolete-variable)))
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5875 (prompt (format "Set %s %s to value: " var
53097
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
5876 (cond ((local-variable-p var)
63866
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5877 "(buffer-local)")
53097
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
5878 ((or current-prefix-arg
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
5879 (local-variable-if-set-p var))
63866
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5880 "buffer-locally")
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5881 (t "globally"))))
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5882 (val (progn
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5883 (when obsolete
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5884 (message (concat "`%S' is obsolete; "
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5885 (if (symbolp obsolete) "use `%S' instead" "%s"))
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5886 var obsolete)
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5887 (sit-for 3))
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5888 (if prop
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5889 ;; Use VAR's `variable-interactive' property
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5890 ;; as an interactive spec for prompting.
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5891 (call-interactively `(lambda (arg)
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5892 (interactive ,prop)
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5893 arg))
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5894 (read
8fe9596925cd (set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents: 63750
diff changeset
5895 (read-string prompt nil
66281
3213e48ea8b3 (set-variable): Use user-variable-p instead of symbolp.
Juri Linkov <juri@jurta.org>
parents: 66114
diff changeset
5896 'set-variable-value-history
3213e48ea8b3 (set-variable): Use user-variable-p instead of symbolp.
Juri Linkov <juri@jurta.org>
parents: 66114
diff changeset
5897 (format "%S" (symbol-value var))))))))
53097
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
5898 (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
5899
63717
2bd9653ec2f2 (set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 63595
diff changeset
5900 (and (custom-variable-p variable)
2bd9653ec2f2 (set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 63595
diff changeset
5901 (not (get variable 'custom-type))
2bd9653ec2f2 (set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 63595
diff changeset
5902 (custom-load-symbol variable))
2bd9653ec2f2 (set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 63595
diff changeset
5903 (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
5904 (when type
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
5905 ;; Match with custom type.
38432
4bbb59858499 (set-variable): Require 'cus-edit' instead of
Gerd Moellmann <gerd@gnu.org>
parents: 38027
diff changeset
5906 (require 'cus-edit)
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
5907 (setq type (widget-convert type))
63717
2bd9653ec2f2 (set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 63595
diff changeset
5908 (unless (widget-apply type :match value)
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
5909 (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
5910 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
5911
e06b5768debd (set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents: 46647
diff changeset
5912 (if make-local
63717
2bd9653ec2f2 (set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 63595
diff changeset
5913 (make-local-variable variable))
2bd9653ec2f2 (set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 63595
diff changeset
5914
2bd9653ec2f2 (set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 63595
diff changeset
5915 (set variable value)
35203
dcf1f0621dbb (set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents: 34909
diff changeset
5916
dcf1f0621dbb (set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents: 34909
diff changeset
5917 ;; 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
5918 ;; 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
5919 (force-mode-line-update))
59567
638fd0a9f545 (just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents: 59486
diff changeset
5920
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
5921 ;; Define the major mode for lists of completions.
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
5922
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94013
diff changeset
5923 (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
5924 (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
5925 (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
5926 (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
5927 (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
5928 (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
5929 (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
5930 (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
5931 (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
5932 (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
5933 map)
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
5934 "Local map for completion list buffers.")
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
5935
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
5936 ;; 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
5937 (put 'completion-list-mode 'mode-class 'special)
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
5938
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
5939 (defvar completion-reference-buffer nil
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
5940 "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
5941 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
5942 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
5943
16924
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
5944 (defvar completion-no-auto-exit nil
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
5945 "Non-nil means `choose-completion-string' should never exit the minibuffer.
106003
acba2c6db48c (x-selection-owner-p): Declare.
Glenn Morris <rgm@gnu.org>
parents: 105994
diff changeset
5946 This also applies to other functions such as `choose-completion'.")
16924
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
5947
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
5948 (defvar completion-base-position nil
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
5949 "Position of the base of the text corresponding to the shown completions.
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
5950 This variable is used in the *Completions* buffers.
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
5951 Its value is a list of the form (START END) where START is the place
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
5952 where the completion should be inserted and END (if non-nil) is the end
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
5953 of the text to replace. If END is nil, point is used instead.")
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
5954
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
5955 (defvar completion-base-size nil
97475
2ac804a70140 (completion-base-size): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 97438
diff changeset
5956 "Number of chars before point not involved in completion.
2ac804a70140 (completion-base-size): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 97438
diff changeset
5957 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
5958 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
5959 minibuffer, or in `completion-reference-buffer' otherwise.
2ac804a70140 (completion-base-size): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 97438
diff changeset
5960 Only characters in the field at point are included.
2ac804a70140 (completion-base-size): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 97438
diff changeset
5961
2ac804a70140 (completion-base-size): Doc fix.
Chong Yidong <cyd@stupidchicken.com>
parents: 97438
diff changeset
5962 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
5963 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
5964 directly.")
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
5965 (make-obsolete-variable 'completion-base-size 'completion-base-position "23.2")
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
5966
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
5967 (defun delete-completion-window ()
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
5968 "Delete the completion list window.
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
5969 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
5970 (interactive)
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
5971 (let ((buf completion-reference-buffer))
16851
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
5972 (if (one-window-p t)
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
5973 (if (window-dedicated-p (selected-window))
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
5974 (delete-frame (selected-frame)))
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
5975 (delete-window (selected-window))
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
5976 (if (get-buffer-window buf)
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
5977 (select-window (get-buffer-window buf))))))
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
5978
10284
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
5979 (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
5980 "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
5981 (interactive "p")
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
5982 (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
5983
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
5984 (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
5985 "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
5986 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
5987 (interactive "p")
33781
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
5988 (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
5989 (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
5990 ;; 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
5991 (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
5992 (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
5993 ;; 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
5994 (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
5995 (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
5996 (setq n (1- n)))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
5997 (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
5998 (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
5999 ;; 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
6000 (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
6001 (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
6002 (point) 'mouse-face nil beg)))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
6003 ;; 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
6004 (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
6005 (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
6006 (point) 'mouse-face nil beg)))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
6007 ;; 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
6008 (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
6009 (point) 'mouse-face nil beg))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
6010 (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
6011
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6012 (defun choose-completion (&optional event)
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6013 "Choose the completion at point."
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6014 (interactive (list last-nonmenu-event))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6015 ;; In case this is run via the mouse, give temporary modes such as
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6016 ;; isearch a chance to turn off.
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6017 (run-hooks 'mouse-leave-buffer-hook)
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6018 (let (buffer base-size base-position choice)
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6019 (with-current-buffer (window-buffer (posn-window (event-start event)))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6020 (setq buffer completion-reference-buffer)
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6021 (setq base-size completion-base-size)
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6022 (setq base-position completion-base-position)
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6023 (save-excursion
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6024 (goto-char (posn-point (event-start event)))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6025 (let (beg end)
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6026 (if (and (not (eobp)) (get-text-property (point) 'mouse-face))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6027 (setq end (point) beg (1+ (point))))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6028 (if (and (not (bobp)) (get-text-property (1- (point)) 'mouse-face))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6029 (setq end (1- (point)) beg (point)))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6030 (if (null beg)
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6031 (error "No completion here"))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6032 (setq beg (previous-single-property-change beg 'mouse-face))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6033 (setq end (or (next-single-property-change end 'mouse-face)
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6034 (point-max)))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6035 (setq choice (buffer-substring-no-properties beg end)))))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6036
8468
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
6037 (let ((owindow (selected-window)))
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6038 (select-window (posn-window (event-start event)))
8468
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
6039 (if (and (one-window-p t 'selected-frame)
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6040 (window-dedicated-p (selected-window)))
8468
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
6041 ;; 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
6042 (iconify-frame (selected-frame))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
6043 (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
6044 (bury-buffer)))
97481
d50fcbf5354d (choose-completion): Try reselecting completion-reference-buffer.
Chong Yidong <cyd@stupidchicken.com>
parents: 97475
diff changeset
6045 (select-window
d50fcbf5354d (choose-completion): Try reselecting completion-reference-buffer.
Chong Yidong <cyd@stupidchicken.com>
parents: 97475
diff changeset
6046 (or (and (buffer-live-p buffer)
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6047 (get-buffer-window buffer 0))
97481
d50fcbf5354d (choose-completion): Try reselecting completion-reference-buffer.
Chong Yidong <cyd@stupidchicken.com>
parents: 97475
diff changeset
6048 owindow)))
106003
acba2c6db48c (x-selection-owner-p): Declare.
Glenn Morris <rgm@gnu.org>
parents: 105994
diff changeset
6049
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6050 (choose-completion-string
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6051 choice buffer
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6052 (or base-position
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6053 (when base-size
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6054 ;; Someone's using old completion code that doesn't know
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6055 ;; about base-position yet.
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6056 (list (+ base-size (with-current-buffer buffer (field-beginning)))))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6057 ;; If all else fails, just guess.
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6058 (with-current-buffer buffer
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6059 (list (choose-completion-guess-base-position choice)))))))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
6060
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
6061 ;; 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
6062 ;; that can be found before POINT.
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6063 (defun choose-completion-guess-base-position (string)
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6064 (save-excursion
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6065 (let ((opoint (point))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6066 len)
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6067 ;; Try moving back by the length of the string.
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6068 (goto-char (max (- (point) (length string))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6069 (minibuffer-prompt-end)))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6070 ;; See how far back we were actually able to move. That is the
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6071 ;; upper bound on how much we can match and delete.
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6072 (setq len (- opoint (point)))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6073 (if completion-ignore-case
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6074 (setq string (downcase string)))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6075 (while (and (> len 0)
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6076 (let ((tail (buffer-substring (point) opoint)))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6077 (if completion-ignore-case
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6078 (setq tail (downcase tail)))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6079 (not (string= tail (substring string 0 len)))))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6080 (setq len (1- len))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6081 (forward-char 1))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6082 (point))))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6083
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
6084 (defun choose-completion-delete-max-match (string)
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6085 (delete-region (choose-completion-guess-base-position string) (point)))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6086 (make-obsolete 'choose-completion-delete-max-match
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6087 'choose-completion-guess-base-position "23.2")
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
6088
45607
98941f178aa2 (choose-completion-string-functions): New special hook.
Kim F. Storm <storm@cua.dk>
parents: 45586
diff changeset
6089 (defvar choose-completion-string-functions nil
45612
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6090 "Functions that may override the normal insertion of a completion choice.
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6091 These functions are called in order with four arguments:
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6092 CHOICE - the string to insert in the buffer,
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6093 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
6094 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
6095 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
6096 the string being completed.
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
6097
45612
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6098 If a function in the list returns non-nil, that function is supposed
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6099 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
6100 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
6101
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
6102 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
6103 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
6104
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6105 (defun choose-completion-string (choice &optional buffer base-position)
45615
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
6106 "Switch to BUFFER and insert the completion choice CHOICE.
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6107 BASE-POSITION, says where to insert the completion."
45615
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
6108
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
6109 ;; 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
6110 ;; 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
6111 ;; 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
6112
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6113 ;; Some older code may call us passing `base-size' instead of
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6114 ;; `base-position'. It's difficult to make any use of `base-size',
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6115 ;; so we just ignore it.
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6116 (unless (consp base-position)
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6117 (message "Obsolete `base-size' passed to choose-completion-string")
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6118 (setq base-position nil))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6119
52046
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
6120 (let* ((buffer (or buffer completion-reference-buffer))
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
6121 (mini-p (minibufferp buffer)))
7333
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
6122 ;; 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
6123 ;; active minibuffer.
27050
5c0c5089979c (choose-completion-string): In minibuffer,
Richard M. Stallman <rms@gnu.org>
parents: 26884
diff changeset
6124 (if (and mini-p
11159
edf66df6fbe9 (choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents: 11140
diff changeset
6125 (or (not (active-minibuffer-window))
edf66df6fbe9 (choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents: 11140
diff changeset
6126 (not (equal buffer
edf66df6fbe9 (choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents: 11140
diff changeset
6127 (window-buffer (active-minibuffer-window))))))
7333
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
6128 (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
6129 ;; 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
6130 (set-buffer buffer)
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
6131 (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
6132 'choose-completion-string-functions
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6133 ;; The fourth arg used to be `mini-p' but was useless
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6134 ;; (since minibufferp can be used on the `buffer' arg)
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6135 ;; and indeed unused. The last used to be `base-size', so we
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6136 ;; keep it to try and avoid breaking old code.
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6137 choice buffer base-position nil)
47346
8287dca5eb2d (what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47316
diff changeset
6138 ;; Insert the completion into the buffer where it was requested.
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6139 (delete-region (or (car base-position) (point))
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6140 (or (cadr base-position) (point)))
45612
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6141 (insert choice)
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6142 (remove-text-properties (- (point) (length choice)) (point)
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6143 '(mouse-face nil))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6144 ;; Update point in the window that BUFFER is showing in.
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6145 (let ((window (get-buffer-window buffer t)))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6146 (set-window-point window (point)))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6147 ;; If completing for the minibuffer, exit it with this choice.
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6148 (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
6149 (minibufferp buffer)
45612
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6150 minibuffer-completion-table
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6151 ;; If this is reading a file name, and the file name chosen
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
6152 ;; is a directory, don't exit the minibuffer.
104345
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
6153 (let* ((result (buffer-substring (field-beginning) (point)))
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
6154 (bounds
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
6155 (completion-boundaries result minibuffer-completion-table
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
6156 minibuffer-completion-predicate
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
6157 "")))
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
6158 (if (eq (car bounds) (length result))
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
6159 ;; The completion chosen leads to a new set of completions
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
6160 ;; (e.g. it's a directory): don't exit the minibuffer yet.
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
6161 (let ((mini (active-minibuffer-window)))
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
6162 (select-window mini)
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
6163 (when minibuffer-auto-raise
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
6164 (raise-frame (window-frame mini))))
23a181f64ba5 (choose-completion-string): Don't rely on minibuffer-completing-file-name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104246
diff changeset
6165 (exit-minibuffer))))))))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
6166
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94013
diff changeset
6167 (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
6168 "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
6169 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
6170 to select the completion near point.
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
6171 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
6172 with the mouse.
d4fe8debe315 Kevin Ryde <user42 at zip.com.au>
Glenn Morris <rgm@gnu.org>
parents: 91327
diff changeset
6173
d4fe8debe315 Kevin Ryde <user42 at zip.com.au>
Glenn Morris <rgm@gnu.org>
parents: 91327
diff changeset
6174 \\{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
6175 (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
6176
37300
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
6177 (defun completion-list-mode-finish ()
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
6178 "Finish setup of the completions buffer.
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
6179 Called from `temp-buffer-show-hook'."
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
6180 (when (eq major-mode 'completion-list-mode)
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
6181 (toggle-read-only 1)))
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
6182
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
6183 (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
6184
66114
13abee3a9bc6 * message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents: 65862
diff changeset
6185
13abee3a9bc6 * message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents: 65862
diff changeset
6186 ;; 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
6187
72645
abc1e4de6197 (completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents: 72638
diff changeset
6188 (defcustom completion-show-help t
abc1e4de6197 (completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents: 72638
diff changeset
6189 "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
6190 :type 'boolean
abc1e4de6197 (completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents: 72638
diff changeset
6191 :version "22.1"
abc1e4de6197 (completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents: 72638
diff changeset
6192 :group 'completion)
abc1e4de6197 (completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents: 72638
diff changeset
6193
66114
13abee3a9bc6 * message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents: 65862
diff changeset
6194 ;; 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
6195 ;; 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
6196 (defun completion-setup-function ()
66595
1d442f601f13 (eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66536
diff changeset
6197 (let* ((mainbuf (current-buffer))
103201
0f518b180240 (completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103072
diff changeset
6198 (base-dir
0f518b180240 (completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103072
diff changeset
6199 ;; When reading a file name in the minibuffer,
0f518b180240 (completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103072
diff changeset
6200 ;; 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
6201 ;; completion list buffer.
0f518b180240 (completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103072
diff changeset
6202 ;; FIXME: Why do we do that, actually? --Stef
0f518b180240 (completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103072
diff changeset
6203 (if minibuffer-completing-file-name
0f518b180240 (completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103072
diff changeset
6204 (file-name-as-directory
0f518b180240 (completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103072
diff changeset
6205 (expand-file-name
0f518b180240 (completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103072
diff changeset
6206 (substring (minibuffer-completion-contents)
0f518b180240 (completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103072
diff changeset
6207 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
6208 (with-current-buffer standard-output
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6209 (let ((base-size completion-base-size) ;Read before killing localvars.
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6210 (base-position completion-base-position))
94062
9fefa536be58 * minibuffer.el (completion-all-completion-with-base-size): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94013
diff changeset
6211 (completion-list-mode)
105601
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6212 (set (make-local-variable 'completion-base-size) base-size)
68686d39c93a Replace completion-base-size by completion-base-position to fix bugs
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105468
diff changeset
6213 (set (make-local-variable 'completion-base-position) base-position))
66595
1d442f601f13 (eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66536
diff changeset
6214 (set (make-local-variable 'completion-reference-buffer) mainbuf)
103201
0f518b180240 (completion-setup-function):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 103072
diff changeset
6215 (if base-dir (setq default-directory base-dir))
72645
abc1e4de6197 (completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents: 72638
diff changeset
6216 ;; Maybe insert help string.
abc1e4de6197 (completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents: 72638
diff changeset
6217 (when completion-show-help
abc1e4de6197 (completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents: 72638
diff changeset
6218 (goto-char (point-min))
abc1e4de6197 (completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents: 72638
diff changeset
6219 (if (display-mouse-p)
abc1e4de6197 (completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents: 72638
diff changeset
6220 (insert (substitute-command-keys
abc1e4de6197 (completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents: 72638
diff changeset
6221 "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
6222 (insert (substitute-command-keys
abc1e4de6197 (completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents: 72638
diff changeset
6223 "In this buffer, type \\[choose-completion] to \
abc1e4de6197 (completion-show-help): New defcustom.
John Paul Wallington <jpw@pobox.com>
parents: 72638
diff changeset
6224 select the completion near point.\n\n"))))))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
6225
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
6226 (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
6227
66595
1d442f601f13 (eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66536
diff changeset
6228 (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
6229 (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
6230
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
6231 (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
6232 "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
6233 (interactive)
105710
eb03599b0d98 (switch-to-completions): Look for *Completions* in other frames as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
6234 (let ((window (or (get-buffer-window "*Completions*" 0)
106124
62c0a89cd695 (switch-to-completions): Move point to the first
Juri Linkov <juri@jurta.org>
parents: 106109
diff changeset
6235 ;; Make sure we have a completions window.
105710
eb03599b0d98 (switch-to-completions): Look for *Completions* in other frames as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
6236 (progn (minibuffer-completion-help)
eb03599b0d98 (switch-to-completions): Look for *Completions* in other frames as well.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105601
diff changeset
6237 (get-buffer-window "*Completions*" 0)))))
20663
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
6238 (when window
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
6239 (select-window window)
106124
62c0a89cd695 (switch-to-completions): Move point to the first
Juri Linkov <juri@jurta.org>
parents: 106109
diff changeset
6240 ;; In the new buffer, go to the first completion.
62c0a89cd695 (switch-to-completions): Move point to the first
Juri Linkov <juri@jurta.org>
parents: 106109
diff changeset
6241 ;; FIXME: Perhaps this should be done in `minibuffer-completion-help'.
62c0a89cd695 (switch-to-completions): Move point to the first
Juri Linkov <juri@jurta.org>
parents: 106109
diff changeset
6242 (when (bobp)
62c0a89cd695 (switch-to-completions): Move point to the first
Juri Linkov <juri@jurta.org>
parents: 106109
diff changeset
6243 (next-completion 1)))))
68345
b10c2ebde562 (clone-buffer, clone-indirect-buffer, clone-indirect-buffer-other-window):
Juri Linkov <juri@jurta.org>
parents: 68280
diff changeset
6244
b10c2ebde562 (clone-buffer, clone-indirect-buffer, clone-indirect-buffer-other-window):
Juri Linkov <juri@jurta.org>
parents: 68280
diff changeset
6245 ;;; 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
6246
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6247 ;; 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
6248 ;; to the following event.
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6249
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6250 (defun event-apply-alt-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
6251 "\\<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
6252 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
6253 (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
6254 (defun event-apply-super-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
6255 "\\<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
6256 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
6257 (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
6258 (defun event-apply-hyper-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
6259 "\\<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
6260 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
6261 (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
6262 (defun event-apply-shift-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
6263 "\\<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
6264 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
6265 (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
6266 (defun event-apply-control-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
6267 "\\<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
6268 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
6269 (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
6270 (defun event-apply-meta-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
6271 "\\<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
6272 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
6273 (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
6274
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6275 (defun event-apply-modifier (event symbol lshiftby prefix)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6276 "Apply a modifier flag to event EVENT.
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6277 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
6278 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
6279 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
6280 (if (numberp event)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6281 (cond ((eq symbol 'control)
11201
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
6282 (if (and (<= (downcase event) ?z)
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
6283 (>= (downcase event) ?a))
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6284 (- (downcase event) ?a -1)
11201
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
6285 (if (and (<= (downcase event) ?Z)
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
6286 (>= (downcase event) ?A))
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6287 (- (downcase event) ?A -1)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6288 (logior (lsh 1 lshiftby) event))))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6289 ((eq symbol 'shift)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6290 (if (and (<= (downcase event) ?z)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6291 (>= (downcase event) ?a))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6292 (upcase event)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6293 (logior (lsh 1 lshiftby) event)))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6294 (t
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6295 (logior (lsh 1 lshiftby) event)))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6296 (if (memq symbol (event-modifiers event))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6297 event
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6298 (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
6299 (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
6300 (if (symbolp event)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6301 event-type
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6302 (cons event-type (cdr event)))))))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
6303
11206
60b7ab7d4fec Change bindings of event-apply-control-modifier,
Karl Heuer <kwzh@gnu.org>
parents: 11201
diff changeset
6304 (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
6305 (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
6306 (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
6307 (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
6308 (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
6309 (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
6310
3947
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
6311 ;;;; Keypad support.
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
6312
81666
5b21f07d3106 Docstring convention fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81587
diff changeset
6313 ;; 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
6314 ;; bindings for the function key symbols, then those bindings will
5b21f07d3106 Docstring convention fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81587
diff changeset
6315 ;; override these, so this shouldn't interfere with any existing
5b21f07d3106 Docstring convention fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81587
diff changeset
6316 ;; bindings.
3947
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
6317
5342
f38861038093 (setting up kp-... keys): Make ascii-character props.
Richard M. Stallman <rms@gnu.org>
parents: 5324
diff changeset
6318 ;; 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
6319 (mapc
3947
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
6320 (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
6321 (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
6322 (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
6323 (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
6324 (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
6325 '((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
6326 (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
6327 (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
6328 (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
6329 (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
6330 (kp-multiply ?*)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
6331 (kp-add ?+)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
6332 (kp-separator ?,)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
6333 (kp-subtract ?-)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
6334 (kp-decimal ?.)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
6335 (kp-divide ?/)
105009
b520d55cdd72 * simple.el: Add mapping for backspace/delete/clear/tab/escape/return
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104990
diff changeset
6336 (kp-equal ?=)
b520d55cdd72 * simple.el: Add mapping for backspace/delete/clear/tab/escape/return
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104990
diff changeset
6337 ;; Do the same for various keys that are represented as symbols under
b520d55cdd72 * simple.el: Add mapping for backspace/delete/clear/tab/escape/return
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104990
diff changeset
6338 ;; GUIs but naturally correspond to characters.
b520d55cdd72 * simple.el: Add mapping for backspace/delete/clear/tab/escape/return
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104990
diff changeset
6339 (backspace 127)
b520d55cdd72 * simple.el: Add mapping for backspace/delete/clear/tab/escape/return
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104990
diff changeset
6340 (delete 127)
b520d55cdd72 * simple.el: Add mapping for backspace/delete/clear/tab/escape/return
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104990
diff changeset
6341 (tab ?\t)
b520d55cdd72 * simple.el: Add mapping for backspace/delete/clear/tab/escape/return
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104990
diff changeset
6342 (linefeed ?\n)
b520d55cdd72 * simple.el: Add mapping for backspace/delete/clear/tab/escape/return
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104990
diff changeset
6343 (clear ?\C-l)
b520d55cdd72 * simple.el: Add mapping for backspace/delete/clear/tab/escape/return
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104990
diff changeset
6344 (return ?\C-m)
b520d55cdd72 * simple.el: Add mapping for backspace/delete/clear/tab/escape/return
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104990
diff changeset
6345 (escape ?\e)
b520d55cdd72 * simple.el: Add mapping for backspace/delete/clear/tab/escape/return
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104990
diff changeset
6346 ))
44906
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
6347
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
6348 ;;;;
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6349 ;;;; forking a twin copy of a buffer.
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
6350 ;;;;
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6351
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6352 (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
6353 "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
6354
91788
14206a515e37 (clone-indirect-buffer-hook): New hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91753
diff changeset
6355 (defvar clone-indirect-buffer-hook nil
14206a515e37 (clone-indirect-buffer-hook): New hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91753
diff changeset
6356 "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
6357
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6358 (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
6359 "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
6360 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
6361 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
6362 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
6363 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
6364 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
6365 (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
6366 (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
6367 (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
6368 (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
6369 (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
6370 (new-process
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6371 (if (memq (process-status process) '(open))
43969
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
6372 (let ((args (process-contact process t)))
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
6373 (setq args (plist-put args :name newname))
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
6374 (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
6375 (if (process-buffer process)
b03a9c537356 (clone-process): Copy process' plist to new process.
Kim F. Storm <storm@cua.dk>
parents: 49103
diff changeset
6376 (current-buffer))))
43969
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
6377 (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
6378 (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
6379 (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
6380 (process-command process)))))
43969
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
6381 (set-process-query-on-exit-flag
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
6382 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
6383 (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
6384 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
6385 (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
6386 (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
6387 (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
6388 new-process)))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6389
44152
cd705768cbe9 Fix typo.
Pavel Janík <Pavel@Janik.cz>
parents: 44070
diff changeset
6390 ;; 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
6391 ;; - syntax-table
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6392 ;; - overlays
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6393 (defun clone-buffer (&optional newname display-flag)
54418
37dfb033f901 (clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54259
diff changeset
6394 "Create and return a twin copy of the current buffer.
37dfb033f901 (clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54259
diff changeset
6395 Unlike an indirect buffer, the new buffer can be edited
37dfb033f901 (clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54259
diff changeset
6396 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
6397 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
6398 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
6399 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
6400 current buffer, with the proper suffix. If DISPLAY-FLAG is
37dfb033f901 (clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54259
diff changeset
6401 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
6402 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
6403 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
6404
37dfb033f901 (clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54259
diff changeset
6405 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
6406 current buffer with appropriate suffix. However, if a prefix
37dfb033f901 (clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54259
diff changeset
6407 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
6408 minibuffer.
37dfb033f901 (clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54259
diff changeset
6409
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6410 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
6411 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
6412 (interactive
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
6413 (progn
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
6414 (if buffer-file-name
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
6415 (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
6416 (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
6417 (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
6418 (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
6419 (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
6420 t)))
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6421 (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
6422 (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
6423 (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
6424 (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
6425 (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
6426 (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
6427 (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
6428 (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
6429 (ptmin (point-min))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6430 (ptmax (point-max))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6431 (pt (point))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6432 (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
6433 (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
6434 (mode major-mode)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6435 (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
6436 (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
6437 (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
6438 (save-restriction
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6439 (widen)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6440 (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
6441 (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
6442 (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
6443 (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
6444 (goto-char pt)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6445 (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
6446 (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
6447
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6448 ;; 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
6449 (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
6450
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6451 ;; 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
6452 (funcall mode)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6453
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6454 ;; Set up other local variables.
84878
c73290ec60ed (clone-buffer): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 84812
diff changeset
6455 (mapc (lambda (v)
c73290ec60ed (clone-buffer): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 84812
diff changeset
6456 (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
6457 (if (symbolp v)
c73290ec60ed (clone-buffer): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 84812
diff changeset
6458 (makunbound v)
c73290ec60ed (clone-buffer): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 84812
diff changeset
6459 (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
6460 (error nil)))
c73290ec60ed (clone-buffer): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents: 84812
diff changeset
6461 lvars)
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6462
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6463 ;; 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
6464 ;; 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
6465 (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
6466 (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
6467 ;; 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
6468 ;; 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
6469 (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
6470 (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
6471 (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
6472 new))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
6473
28624
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
6474
28659
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
6475 (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
6476 "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
6477
63592
153f4469d91a (next-error-buffer-p, next-error-find-buffer): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 63487
diff changeset
6478 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
6479 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
6480 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
6481 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
6482 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
6483 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
6484 property results in an error.
28624
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
6485
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
6486 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
6487 This is always done when called interactively.
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
6488
64548
cff17c5abe4d (clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents: 64289
diff changeset
6489 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
6490 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
6491 (interactive
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
6492 (progn
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
6493 (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
6494 (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
6495 (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
6496 (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
6497 t)))
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
6498 (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
6499 (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
6500 (setq newname (or newname (buffer-name)))
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
6501 (if (string-match "<[0-9]+>\\'" newname)
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
6502 (setq newname (substring newname 0 (match-beginning 0))))
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
6503 (let* ((name (generate-new-buffer-name newname))
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
6504 (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
6505 (with-current-buffer buffer
14206a515e37 (clone-indirect-buffer-hook): New hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91753
diff changeset
6506 (run-hooks 'clone-indirect-buffer-hook))
28624
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
6507 (when display-flag
33781
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
6508 (pop-to-buffer buffer norecord))
28624
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
6509 buffer))
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
6510
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
6511
68403
18c6a9d97dc1 (move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents: 68352
diff changeset
6512 (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
6513 "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
6514 (interactive
c1db05754431 (set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 68042
diff changeset
6515 (progn
c1db05754431 (set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 68042
diff changeset
6516 (if (get major-mode 'no-clone-indirect)
c1db05754431 (set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 68042
diff changeset
6517 (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
6518 (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
6519 (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
6520 t)))
45064
6e3c5d67f0fe (clone-indirect-buffer-other-window): Fix a typo in `pop-up-window'.
Eli Zaretskii <eliz@gnu.org>
parents: 44981
diff changeset
6521 (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
6522 (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
6523
44906
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
6524
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
6525 ;;; Handling of Backspace and Delete keys.
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
6526
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
6527 (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
6528 "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
6529
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
6530 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
6531 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
6532
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
6533 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
6534
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
6535 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
6536 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
6537 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
6538 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
6539 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
6540 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
6541
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
6542 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
6543 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
6544 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
6545 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
6546 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
6547 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
6548
0f079e057295 (delete-key-deletes-forward): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34713
diff changeset
6549 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
6550 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
6551 :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
6552 (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
6553 (other :tag "On" t))
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
6554 :group 'editing-basics
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
6555 :version "21.1"
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
6556 :set (lambda (symbol value)
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
6557 ;; 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
6558 ;; dumping Emacs. It doesn't really matter.
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
6559 (if (fboundp 'normal-erase-is-backspace-mode)
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
6560 (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
6561 (set-default symbol value))))
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
6562
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
6563 (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
6564 "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
6565 (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
6566 (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
6567 (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
6568 (normal-erase-is-backspace-mode
38640f40d45e (normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83716
diff changeset
6569 (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
6570 (and (not noninteractive)
38640f40d45e (normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83716
diff changeset
6571 (or (memq system-type '(ms-dos windows-nt))
109379
863ed9bd7c0e term/ns-win.el: Bind M-~ to 'ns-prev-frame (due to Matthew Dempsky; bug#5084). Remove incorrect binding for S-tab. (ns-alternatives-map): Change S-tab binding to backtab (bug#6616). * simple.el (normal-erase-is-backspace-setup-frame): Set mode on under ns.
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 109062
diff changeset
6572 (memq window-system '(ns))
84381
38640f40d45e (normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83716
diff changeset
6573 (and (memq window-system '(x))
38640f40d45e (normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83716
diff changeset
6574 (fboundp 'x-backspace-delete-keys-p)
38640f40d45e (normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83716
diff changeset
6575 (x-backspace-delete-keys-p))
38640f40d45e (normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83716
diff changeset
6576 ;; 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
6577 ;; 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
6578 ;; 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
6579 (and (null window-system)
38640f40d45e (normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83716
diff changeset
6580 (eq tty-erase-char ?\^H))))
38640f40d45e (normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83716
diff changeset
6581 normal-erase-is-backspace)
38640f40d45e (normal-erase-is-backspace-setup-frame): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83716
diff changeset
6582 1 0)))))
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
6583
108242
dc6153a5f4f7 Use define-minor-mode in more cases.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108212
diff changeset
6584 (define-minor-mode normal-erase-is-backspace-mode
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
6585 "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
6586
99257
1fbe0f0007b7 * simple.el (idle-update-delay, next-error-highlight)
Juanma Barranquero <lekktu@gmail.com>
parents: 99008
diff changeset
6587 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
6588
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
6589 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
6590 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
6591 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
6592 `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
6593 global or local keymap will override that.)
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
6594
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
6595 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
6596 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
6597 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
6598 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
6599 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
6600 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
6601 `backward-kill-word'.
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
6602
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
6603 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
6604 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
6605 `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
6606 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
6607
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
6608 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
6609 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
6610 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
6611 have both Backspace, Delete and F1 keys.
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
6612
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
6613 See also `normal-erase-is-backspace'."
108242
dc6153a5f4f7 Use define-minor-mode in more cases.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108212
diff changeset
6614 :variable (eq (terminal-parameter
dc6153a5f4f7 Use define-minor-mode in more cases.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108212
diff changeset
6615 nil 'normal-erase-is-backspace) 1)
dc6153a5f4f7 Use define-minor-mode in more cases.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108212
diff changeset
6616 (let ((enabled (eq 1 (terminal-parameter
dc6153a5f4f7 Use define-minor-mode in more cases.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 108212
diff changeset
6617 nil 'normal-erase-is-backspace))))
83448
d2af586aefe4 Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents: 83429
diff changeset
6618
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96874
diff changeset
6619 (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
6620 (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
6621 (let* ((bindings
101577
50a9b1249468 the latter is not available on ttys anyway.
Chong Yidong <cyd@stupidchicken.com>
parents: 101181
diff changeset
6622 `(([M-delete] [M-backspace])
83448
d2af586aefe4 Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents: 83429
diff changeset
6623 ([C-M-delete] [C-M-backspace])
105712
3f36e4d4d40c * simple.el (normal-erase-is-backspace-mode): Use input-decode-map
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105710
diff changeset
6624 ([?\e C-delete] [?\e C-backspace])))
83448
d2af586aefe4 Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents: 83429
diff changeset
6625 (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
6626
d2af586aefe4 Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents: 83429
diff changeset
6627 (if enabled
d2af586aefe4 Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents: 83429
diff changeset
6628 (progn
d2af586aefe4 Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents: 83429
diff changeset
6629 (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
6630 (define-key local-function-key-map [kp-delete] [?\C-d])
105712
3f36e4d4d40c * simple.el (normal-erase-is-backspace-mode): Use input-decode-map
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105710
diff changeset
6631 (define-key local-function-key-map [backspace] [?\C-?])
3f36e4d4d40c * simple.el (normal-erase-is-backspace-mode): Use input-decode-map
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105710
diff changeset
6632 (dolist (b bindings)
3f36e4d4d40c * simple.el (normal-erase-is-backspace-mode): Use input-decode-map
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105710
diff changeset
6633 ;; Not sure if input-decode-map is really right, but
3f36e4d4d40c * simple.el (normal-erase-is-backspace-mode): Use input-decode-map
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105710
diff changeset
6634 ;; keyboard-translate-table (used below) only works
3f36e4d4d40c * simple.el (normal-erase-is-backspace-mode): Use input-decode-map
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105710
diff changeset
6635 ;; for integer events, and key-translation-table is
3f36e4d4d40c * simple.el (normal-erase-is-backspace-mode): Use input-decode-map
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105710
diff changeset
6636 ;; global (like the global-map, used earlier).
3f36e4d4d40c * simple.el (normal-erase-is-backspace-mode): Use input-decode-map
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105710
diff changeset
6637 (define-key input-decode-map (car b) nil)
3f36e4d4d40c * simple.el (normal-erase-is-backspace-mode): Use input-decode-map
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105710
diff changeset
6638 (define-key input-decode-map (cadr b) nil)))
83448
d2af586aefe4 Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents: 83429
diff changeset
6639 (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
6640 (define-key local-function-key-map [kp-delete] [?\C-?])
105712
3f36e4d4d40c * simple.el (normal-erase-is-backspace-mode): Use input-decode-map
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105710
diff changeset
6641 (define-key local-function-key-map [backspace] [?\C-?])
3f36e4d4d40c * simple.el (normal-erase-is-backspace-mode): Use input-decode-map
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105710
diff changeset
6642 (dolist (b bindings)
3f36e4d4d40c * simple.el (normal-erase-is-backspace-mode): Use input-decode-map
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105710
diff changeset
6643 (define-key input-decode-map (car b) (cadr b))
3f36e4d4d40c * simple.el (normal-erase-is-backspace-mode): Use input-decode-map
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105710
diff changeset
6644 (define-key input-decode-map (cadr b) (car b))))))
83448
d2af586aefe4 Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents: 83429
diff changeset
6645 (t
d2af586aefe4 Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents: 83429
diff changeset
6646 (if enabled
35346
382fba2f10a6 (delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents: 35333
diff changeset
6647 (progn
83448
d2af586aefe4 Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents: 83429
diff changeset
6648 (keyboard-translate ?\C-h ?\C-?)
d2af586aefe4 Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents: 83429
diff changeset
6649 (keyboard-translate ?\C-? ?\C-d))
d2af586aefe4 Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents: 83429
diff changeset
6650 (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
6651 (keyboard-translate ?\C-? ?\C-?))))
d2af586aefe4 Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents: 83429
diff changeset
6652
105372
bd2966850aac Use `called-interactively-p' instead of `interactive-p'.
Juanma Barranquero <lekktu@gmail.com>
parents: 105051
diff changeset
6653 (if (called-interactively-p 'interactive)
83448
d2af586aefe4 Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents: 83429
diff changeset
6654 (message "Delete key deletes %s"
106357
93e5b9138482 (normal-erase-is-backspace-mode): Fix thinko in message.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106129
diff changeset
6655 (if (eq 1 (terminal-parameter nil 'normal-erase-is-backspace))
83448
d2af586aefe4 Fix Delete keys under X (for good, this time).
Karoly Lorentey <lorentey@elte.hu>
parents: 83429
diff changeset
6656 "forward" "backward")))))
51220
c7730f2ad484 (idle-update-delay): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 51219
diff changeset
6657
51606
bee14d8ec0a6 (kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51597
diff changeset
6658 (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
6659 "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
6660
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
6661 (define-minor-mode visible-mode
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
6662 "Toggle Visible mode.
78492
7c8949dbfa0d Replace `iff' in doc-strings and comments.
Glenn Morris <rgm@gnu.org>
parents: 78236
diff changeset
6663 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
6664 turn it off.
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
6665
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
6666 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
6667 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
6668 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
6669 :lighter " Vis"
61232
728460f45e1e (visible-mode): Use explicit :group keyword. This changes the group
Luc Teirlinck <teirllm@auburn.edu>
parents: 61121
diff changeset
6670 :group 'editing-basics
51606
bee14d8ec0a6 (kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51597
diff changeset
6671 (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
6672 (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
6673 (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
6674 (when visible-mode
51606
bee14d8ec0a6 (kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51597
diff changeset
6675 (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
6676 buffer-invisibility-spec)
bee14d8ec0a6 (kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51597
diff changeset
6677 (setq buffer-invisibility-spec nil)))
51597
9b14210f4740 (vis-mode): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51461
diff changeset
6678
98949
46d6efaefafc (apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents: 98892
diff changeset
6679 ;; Partial application of functions (similar to "currying").
106109
42ca82b4620b * abbrev.el (abbrev-with-wrapper-hook): (re)move...
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 106028
diff changeset
6680 ;; This function is here rather than in subr.el because it uses CL.
98949
46d6efaefafc (apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents: 98892
diff changeset
6681 (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
6682 "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
6683 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
6684 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
6685 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
6686 was called."
46d6efaefafc (apply-partially): Move from subr.el to simple.el.
Eli Zaretskii <eliz@gnu.org>
parents: 98892
diff changeset
6687 (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
6688 (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
6689
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
6690 ;; Minibuffer prompt stuff.
39271
d56dcab29cce (minibuffer-prompt-modification)
Gerd Moellmann <gerd@gnu.org>
parents: 39157
diff changeset
6691
39289
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
6692 ;(defun minibuffer-prompt-modification (start end)
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
6693 ; (error "You cannot modify the prompt"))
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
6694 ;
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
6695 ;
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
6696 ;(defun minibuffer-prompt-insertion (start end)
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
6697 ; (let ((inhibit-modification-hooks t))
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
6698 ; (delete-region start end)
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
6699 ; ;; 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
6700 ; ;; and for the text deletion.above.
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
6701 ; (when (consp buffer-undo-list)
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
6702 ; (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
6703 ; (message "You cannot modify the prompt")))
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
6704 ;
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
6705 ;
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
6706 ;(setq minibuffer-prompt-properties
39289
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
6707 ; (list 'modification-hooks '(minibuffer-prompt-modification)
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
6708 ; 'insert-in-front-hooks '(minibuffer-prompt-insertion)))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
6709 ;
39271
d56dcab29cce (minibuffer-prompt-modification)
Gerd Moellmann <gerd@gnu.org>
parents: 39157
diff changeset
6710
78548
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6711
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6712 ;;;; Problematic external packages.
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6713
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6714 ;; 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
6715 ;; 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
6716 ;; flexible as it could be. See the thread:
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6717 ;; 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
6718 (defconst bad-packages-alist
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6719 ;; Not sure exactly which semantic versions have problems.
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6720 ;; 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
6721 '((semantic semantic-version "\\`2\\.0pre[1-3]\\'"
78548
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6722 "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
6723 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
6724 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
6725 ;; 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
6726 ;; 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
6727 ;; 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
6728 ;; 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
6729 (CUA-mode t nil
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6730 "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
6731 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
6732
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6733 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
6734 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
6735 version and use the one distributed with Emacs."))
78548
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6736 "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
6737 Each element has the form (PACKAGE SYMBOL REGEXP STRING).
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6738 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
6739 symbol (a feature name); see the documentation of
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6740 `after-load-alist', to which this variable adds functions.
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6741 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
6742 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
6743 warning using STRING as the message.")
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6744
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6745 (defun bad-package-check (package)
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6746 "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
6747 (condition-case nil
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6748 (let* ((list (assoc package bad-packages-alist))
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6749 (symbol (nth 1 list)))
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6750 (and list
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6751 (boundp symbol)
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6752 (or (eq symbol t)
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6753 (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
6754 (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
6755 (display-warning package (nth 3 list) :warning)))
78548
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6756 (error nil)))
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6757
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6758 (mapc (lambda (elem)
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6759 (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
6760 bad-packages-alist)
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6761
3938d27d7af0 (bad-packages-alist): New constant.
Glenn Morris <rgm@gnu.org>
parents: 78492
diff changeset
6762
47462
1bbef0cbbf67 Provide `simple'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47408
diff changeset
6763 (provide 'simple)
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52367
diff changeset
6764
55699
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
6765 ;; arch-tag: 24af67c0-2a49-44f6-b3b1-312d8b570dfd
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
6766 ;;; simple.el ends here