Mercurial > emacs
annotate lisp/simple.el @ 70651:54d96a288372
(handle_one_xevent): Fix crash in 2006-03-24 change.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Sun, 14 May 2006 00:30:46 +0000 |
parents | 2ed5d4bbedbf |
children | d3fec44f2362 b6689e223e2f a5812696f7bf |
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, |
68352
de7cc6d3013b
(clone-buffer): Don't show the new buffer in the same window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68345
diff
changeset
|
4 ;; 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. |
475 | 5 |
45078 | 6 ;; Maintainer: FSF |
7 ;; Keywords: internal | |
8 | |
475 | 9 ;; This file is part of GNU Emacs. |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
13 ;; the Free Software Foundation; either version 2, or (at your option) |
475 | 14 ;; any later version. |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
14169 | 22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 ;; Boston, MA 02110-1301, USA. | |
475 | 25 |
2315
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
26 ;;; Commentary: |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
27 |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
28 ;; A grab-bag of basic Emacs commands not specifically related to some |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
29 ;; major mode or to file-handling. |
9e7ec92a4fdf
Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2301
diff
changeset
|
30 |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
31 ;;; Code: |
475 | 32 |
26466 | 33 (eval-when-compile |
30820
4b32734572d8
Autoload widget-convert when compiling.
Dave Love <fx@gnu.org>
parents:
30441
diff
changeset
|
34 (autoload 'widget-convert "wid-edit") |
45637 | 35 (autoload 'shell-mode "shell")) |
26466 | 36 |
65295
0a6b52c97d53
(compilation-current-error): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
65173
diff
changeset
|
37 (defvar compilation-current-error) |
0a6b52c97d53
(compilation-current-error): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
65173
diff
changeset
|
38 |
61111
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
39 (defcustom idle-update-delay 0.5 |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
40 "*Idle time delay before updating various things on the screen. |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
41 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
|
42 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
|
43 :type 'number |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
44 :group 'display |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
45 :version "22.1") |
26466 | 46 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
47 (defgroup killing nil |
56005
54d79ab53dd3
(eval-expression-print-format): Don't print additional
Juri Linkov <juri@jurta.org>
parents:
55975
diff
changeset
|
48 "Killing and yanking commands." |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
49 :group 'editing) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
50 |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
51 (defgroup paren-matching nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
52 "Highlight (un)matching of parens and expressions." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
53 :group 'matching) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
54 |
67777
8eda669e2619
(get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents:
67621
diff
changeset
|
55 (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
|
56 "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
|
57 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
|
58 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
|
59 |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
60 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
|
61 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
|
62 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
|
63 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
|
64 ;; 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
|
65 (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
|
66 (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
|
67 found buf) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
68 (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
|
69 (setq buf (car list)) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
70 (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
|
71 (buffer-live-p buf) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
72 (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
|
73 (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
|
74 (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
|
75 (setq found buf) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
76 (setq list (cdr list)))) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
77 (car list))) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
78 |
67777
8eda669e2619
(get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents:
67621
diff
changeset
|
79 (defun last-buffer (&optional buffer visible-ok frame) |
8eda669e2619
(get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents:
67621
diff
changeset
|
80 "Return the last non-hidden displayable buffer in the buffer list. |
67602
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
81 If BUFFER is non-nil, last-buffer will ignore that buffer. |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
82 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
|
83 unless optional argument 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
|
84 If the optional third argument FRAME is non-nil, use that frame's |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
85 buffer list instead of the selected frame's buffer list. |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
86 If no other buffer exists, the buffer `*scratch*' is returned." |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
87 (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
|
88 (or (get-next-valid-buffer (frame-parameter frame 'buried-buffer-list) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
89 buffer visible-ok frame) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
90 (get-next-valid-buffer (nreverse (buffer-list frame)) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
91 buffer visible-ok frame) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
92 (progn |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
93 (set-buffer-major-mode (get-buffer-create "*scratch*")) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
94 (get-buffer "*scratch*")))) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
95 |
44906
fe8ce22fc4a1
(next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents:
44756
diff
changeset
|
96 (defun next-buffer () |
fe8ce22fc4a1
(next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents:
44756
diff
changeset
|
97 "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
|
98 (interactive) |
67602
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
99 (let ((buffer (current-buffer)) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
100 (bbl (frame-parameter nil 'buried-buffer-list))) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
101 (switch-to-buffer (other-buffer buffer t)) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
102 (bury-buffer buffer) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
103 (set-frame-parameter nil 'buried-buffer-list |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
104 (cons buffer (delq buffer bbl))))) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
105 |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
106 (defun previous-buffer () |
44906
fe8ce22fc4a1
(next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents:
44756
diff
changeset
|
107 "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
|
108 (interactive) |
67602
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
109 (let ((buffer (last-buffer (current-buffer) t)) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
110 (bbl (frame-parameter nil 'buried-buffer-list))) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
111 (switch-to-buffer buffer) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
112 ;; Clean up buried-buffer-list up to and including the chosen buffer. |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
113 (while (and bbl (not (eq (car bbl) buffer))) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
114 (setq bbl (cdr bbl))) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
115 (set-frame-parameter nil 'buried-buffer-list bbl))) |
3fbbf35e6d87
2005-12-16 Lrentey Kroly <lorentey@elte.hu>
Károly Lőrentey <lorentey@elte.hu>
parents:
67446
diff
changeset
|
116 |
56863
c8bb5aca0581
* simple.el (next-error): New defgroup and defface.
Juri Linkov <juri@jurta.org>
parents:
56862
diff
changeset
|
117 |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
118 ;;; next-error support framework |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
119 |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
120 (defgroup next-error nil |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
121 "`next-error' support framework." |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
122 :group 'compilation |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59790
diff
changeset
|
123 :version "22.1") |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
124 |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
125 (defface next-error |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
126 '((t (:inherit region))) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
127 "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
|
128 :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
|
129 :version "22.1") |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
130 |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
131 (defcustom next-error-highlight 0.1 |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
132 "*Highlighting of locations in selected source buffers. |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
133 If number, highlight the locus in `next-error' face for given time in seconds. |
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
134 If t, use persistent overlays fontified in `next-error' face. |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
135 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
|
136 If `fringe-arrow', indicate the locus by the fringe arrow." |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
137 :type '(choice (number :tag "Delay") |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
138 (const :tag "Persistent overlay" t) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
139 (const :tag "No highlighting" nil) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
140 (const :tag "Fringe arrow" 'fringe-arrow)) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
141 :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
|
142 :version "22.1") |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
143 |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
144 (defcustom next-error-highlight-no-select 0.1 |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
145 "*Highlighting of locations in non-selected source buffers. |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
146 If number, highlight the locus in `next-error' face for given time in seconds. |
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
147 If t, use persistent overlays fontified in `next-error' face. |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
148 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
|
149 If `fringe-arrow', indicate the locus by the fringe arrow." |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
150 :type '(choice (number :tag "Delay") |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
151 (const :tag "Persistent overlay" t) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
152 (const :tag "No highlighting" nil) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
153 (const :tag "Fringe arrow" 'fringe-arrow)) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
154 :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
|
155 :version "22.1") |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
156 |
64195
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
157 (defcustom next-error-hook nil |
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
158 "*List of hook functions run by `next-error' after visiting source file." |
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
159 :type 'hook |
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
160 :group 'next-error) |
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
161 |
61070
ed6d9a5fc534
(next-error-highlight-timer): New variable.
Juri Linkov <juri@jurta.org>
parents:
60744
diff
changeset
|
162 (defvar next-error-highlight-timer nil) |
ed6d9a5fc534
(next-error-highlight-timer): New variable.
Juri Linkov <juri@jurta.org>
parents:
60744
diff
changeset
|
163 |
61361
d5052fc4ea58
(next-error-overlay-arrow-position): New defvar.
Juri Linkov <juri@jurta.org>
parents:
61276
diff
changeset
|
164 (defvar next-error-overlay-arrow-position nil) |
62179
10a82ef7d0a9
(next-error-overlay-arrow-position): Revert the change made on 2005-04-30.
Eli Zaretskii <eliz@gnu.org>
parents:
62093
diff
changeset
|
165 (put 'next-error-overlay-arrow-position 'overlay-arrow-string "=>") |
61361
d5052fc4ea58
(next-error-overlay-arrow-position): New defvar.
Juri Linkov <juri@jurta.org>
parents:
61276
diff
changeset
|
166 (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
|
167 |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
168 (defvar next-error-last-buffer nil |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
169 "The most recent `next-error' buffer. |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
170 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
|
171 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
|
172 or \\[compile-goto-error].") |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
173 |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
174 (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
|
175 "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
|
176 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
|
177 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
|
178 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
|
179 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
|
180 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
|
181 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
|
182 to navigate in it.") |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
183 |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
184 (make-variable-buffer-local 'next-error-function) |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
185 |
58951
c7ebd794182b
(next-error-buffer-p, next-error-find-buffer): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
58917
diff
changeset
|
186 (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
|
187 &optional avoid-current |
58951
c7ebd794182b
(next-error-buffer-p, next-error-find-buffer): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
58917
diff
changeset
|
188 extra-test-inclusive |
58625
31d0b9422d7b
simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents:
58354
diff
changeset
|
189 extra-test-exclusive) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
190 "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
|
191 |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
192 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
|
193 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
|
194 |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
195 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
|
196 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
|
197 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
|
198 |
67777
8eda669e2619
(get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents:
67621
diff
changeset
|
199 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
|
200 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
|
201 that buffer is rejected." |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
202 (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
|
203 (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
|
204 (with-current-buffer buffer |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
205 (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
|
206 ;; Optionally reject some buffers. |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
207 (if extra-test-exclusive |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
208 (funcall extra-test-exclusive) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
209 t) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
210 ;; Optionally accept some other buffers. |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
211 (and extra-test-inclusive |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
212 (funcall extra-test-inclusive)))))) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
213 |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
214 (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
|
215 extra-test-inclusive |
58625
31d0b9422d7b
simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents:
58354
diff
changeset
|
216 extra-test-exclusive) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
217 "Return a `next-error' capable buffer. |
67777
8eda669e2619
(get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents:
67621
diff
changeset
|
218 |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
219 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
|
220 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
|
221 |
63592
153f4469d91a
(next-error-buffer-p, next-error-find-buffer): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
63487
diff
changeset
|
222 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
|
223 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
|
224 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
|
225 |
67777
8eda669e2619
(get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents:
67621
diff
changeset
|
226 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
|
227 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
|
228 that buffer is rejected." |
56862
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
229 (or |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
230 ;; 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
|
231 (let ((window-buffers |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
232 (delete-dups |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
233 (delq nil (mapcar (lambda (w) |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
234 (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
|
235 (window-buffer w) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
236 avoid-current |
58951
c7ebd794182b
(next-error-buffer-p, next-error-find-buffer): Doc fix.
Juri Linkov <juri@jurta.org>
parents:
58917
diff
changeset
|
237 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
|
238 (window-buffer w))) |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
239 (window-list)))))) |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
240 (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
|
241 (car window-buffers))) |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
242 ;; 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
|
243 (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
|
244 (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
|
245 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
|
246 next-error-last-buffer) |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
247 ;; 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
|
248 (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
|
249 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
|
250 (current-buffer)) |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
251 ;; 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
|
252 (let ((buffers (buffer-list))) |
adba247afe3f
* simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents:
56861
diff
changeset
|
253 (while (and buffers |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
254 (not (next-error-buffer-p |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
255 (car buffers) 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 (setq buffers (cdr buffers))) |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
258 (car buffers)) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
259 ;; 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
|
260 ;; even despite AVOID-CURRENT. |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
261 (and avoid-current |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
262 (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
|
263 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
|
264 (progn |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
265 (message "This is the only next-error capable buffer") |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
266 (current-buffer))) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
267 ;; 6. Give up. |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
268 (error "No next-error capable buffer found"))) |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
269 |
56861
2e59d9187762
(next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents:
56761
diff
changeset
|
270 (defun next-error (&optional arg reset) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
271 "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
|
272 |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
273 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
|
274 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
|
275 |
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
|
276 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
|
277 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
|
278 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
|
279 and start at the first error. |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
280 |
55425
1acbf23561f5
(next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55294
diff
changeset
|
281 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
|
282 |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
283 \\[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
|
284 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
|
285 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
|
286 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
|
287 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
|
288 `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
|
289 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
|
290 \\[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
|
291 in the current frame. |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
292 |
64195
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
293 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
|
294 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
|
295 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
|
296 or Compilation Minor mode. |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
297 |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
298 See variables `compilation-parse-errors-function' and |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
299 \`compilation-error-regexp-alist' for customization ideas." |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
300 (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
|
301 (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
|
302 (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
|
303 ;; 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
|
304 (with-current-buffer next-error-last-buffer |
64195
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
305 (funcall next-error-function (prefix-numeric-value arg) reset) |
c8096b015bf1
(next-error-hook): New variable.
Juri Linkov <juri@jurta.org>
parents:
64091
diff
changeset
|
306 (run-hooks 'next-error-hook)))) |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
307 |
65782
d88ec92a0f15
(next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents:
65698
diff
changeset
|
308 (defun next-error-internal () |
d88ec92a0f15
(next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents:
65698
diff
changeset
|
309 "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
|
310 (setq next-error-last-buffer (current-buffer)) |
d88ec92a0f15
(next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents:
65698
diff
changeset
|
311 ;; 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
|
312 (with-current-buffer next-error-last-buffer |
d88ec92a0f15
(next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents:
65698
diff
changeset
|
313 (funcall next-error-function 0 nil) |
d88ec92a0f15
(next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents:
65698
diff
changeset
|
314 (run-hooks 'next-error-hook))) |
d88ec92a0f15
(next-error-internal): New function.
Richard M. Stallman <rms@gnu.org>
parents:
65698
diff
changeset
|
315 |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
316 (defalias 'goto-next-locus 'next-error) |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
317 (defalias 'next-match 'next-error) |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
318 |
56861
2e59d9187762
(next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents:
56761
diff
changeset
|
319 (defun previous-error (&optional n) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
320 "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
|
321 |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
322 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
|
323 forwards, if negative). |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
324 |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
325 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
|
326 (interactive "p") |
56861
2e59d9187762
(next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents:
56761
diff
changeset
|
327 (next-error (- (or n 1)))) |
2e59d9187762
(next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents:
56761
diff
changeset
|
328 |
2e59d9187762
(next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents:
56761
diff
changeset
|
329 (defun first-error (&optional n) |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
330 "Restart at the first error. |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
331 Visit corresponding source code. |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
332 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
|
333 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
|
334 (interactive "p") |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
335 (next-error n t)) |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
336 |
56861
2e59d9187762
(next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents:
56761
diff
changeset
|
337 (defun next-error-no-select (&optional n) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
338 "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
|
339 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
|
340 backwards, if negative). |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
341 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
|
342 select the source buffer." |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
343 (interactive "p") |
56863
c8bb5aca0581
* simple.el (next-error): New defgroup and defface.
Juri Linkov <juri@jurta.org>
parents:
56862
diff
changeset
|
344 (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
|
345 (next-error n)) |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
346 (pop-to-buffer next-error-last-buffer)) |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
347 |
56861
2e59d9187762
(next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents:
56761
diff
changeset
|
348 (defun previous-error-no-select (&optional n) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
349 "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
|
350 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
|
351 forwards, if negative). |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
352 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
|
353 select the source buffer." |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
354 (interactive "p") |
56861
2e59d9187762
(next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents:
56761
diff
changeset
|
355 (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
|
356 |
56918
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
357 ;;; Internal variable for `next-error-follow-mode-post-command-hook'. |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
358 (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
|
359 |
56926 | 360 (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
|
361 "Minor mode for compilation, occur and diff modes. |
56926 | 362 When turned on, cursor motion in the compilation, grep, occur or diff |
363 buffer causes automatic display of the corresponding source code | |
364 location." | |
64991
942d4ce7c22d
(next-error-follow-minor-mode): Fix init value and
Dan Nicolaescu <dann@ics.uci.edu>
parents:
64911
diff
changeset
|
365 :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
|
366 (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
|
367 (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
|
368 (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
|
369 (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
|
370 |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
371 ;;; Used as a `post-command-hook' by `next-error-follow-mode' |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
372 ;;; for the *Compilation* *grep* and *Occur* buffers. |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
373 (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
|
374 (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
|
375 (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
|
376 (condition-case nil |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
377 (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
|
378 (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
|
379 (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
|
380 (error t)))) |
2e166bd5683b
(next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents:
56863
diff
changeset
|
381 |
56863
c8bb5aca0581
* simple.el (next-error): New defgroup and defface.
Juri Linkov <juri@jurta.org>
parents:
56862
diff
changeset
|
382 |
55066
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
383 ;;; |
057613675a0b
From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents:
54910
diff
changeset
|
384 |
25292 | 385 (defun fundamental-mode () |
386 "Major mode not specialized for anything in particular. | |
387 Other major modes are defined by comparison with this one." | |
388 (interactive) | |
57146
942b8e28d21a
(fundamental-mode): Run `after-change-major-mode-hook'.
Luc Teirlinck <teirllm@auburn.edu>
parents:
57069
diff
changeset
|
389 (kill-all-local-variables) |
63485
1e618742c46c
(fundamental-mode): Run after-change-major-mode-hook conditionally.
Lute Kamstra <lute@gnu.org>
parents:
63136
diff
changeset
|
390 (unless delay-mode-hooks |
1e618742c46c
(fundamental-mode): Run after-change-major-mode-hook conditionally.
Lute Kamstra <lute@gnu.org>
parents:
63136
diff
changeset
|
391 (run-hooks 'after-change-major-mode-hook))) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
392 |
25292 | 393 ;; Making and deleting lines. |
394 | |
66965
1bca10e9d192
* simple.el (hard-newline): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66950
diff
changeset
|
395 (defvar hard-newline (propertize "\n" 'hard t 'rear-nonsticky '(hard))) |
1bca10e9d192
* simple.el (hard-newline): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66950
diff
changeset
|
396 |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
397 (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
|
398 "Insert a newline, and move to left margin of the new line if it's blank. |
42128 | 399 If `use-hard-newlines' is non-nil, the newline is marked with the |
400 text-property `hard'. | |
31978
3a5e22f4cd99
(read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31573
diff
changeset
|
401 With ARG, insert that many newlines. |
42128 | 402 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
|
403 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
|
404 (interactive "*P") |
13137
a83a1515fd9b
(newline): Call barf-if-buffer-read-only.
Richard M. Stallman <rms@gnu.org>
parents:
12975
diff
changeset
|
405 (barf-if-buffer-read-only) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
406 ;; Inserting a newline at the end of a line produces better redisplay in |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
407 ;; try_window_id than inserting at the beginning of a line, and the textual |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
408 ;; result is the same. So, if we're at beginning of line, pretend to be at |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
409 ;; the end of the previous line. |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
410 (let ((flag (and (not (bobp)) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
411 (bolp) |
17214
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
412 ;; Make sure no functions want to be told about |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
413 ;; the range of the changes. |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
414 (not after-change-functions) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
415 (not before-change-functions) |
16417
fb6785d0c256
(newline): Use buffer-has-markers-at.
Richard M. Stallman <rms@gnu.org>
parents:
16408
diff
changeset
|
416 ;; Make sure there are no markers here. |
fb6785d0c256
(newline): Use buffer-has-markers-at.
Richard M. Stallman <rms@gnu.org>
parents:
16408
diff
changeset
|
417 (not (buffer-has-markers-at (1- (point)))) |
21459
b787b88cc575
(newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents:
21222
diff
changeset
|
418 (not (buffer-has-markers-at (point))) |
17214
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
419 ;; Make sure no text properties want to know |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
420 ;; where the change was. |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
421 (not (get-char-property (1- (point)) 'modification-hooks)) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
422 (not (get-char-property (1- (point)) 'insert-behind-hooks)) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
423 (or (eobp) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
424 (not (get-char-property (point) 'insert-in-front-hooks))) |
15605
8b2f2d10c40a
(newline): Don't do the optimization if the newline before point is
Miles Bader <miles@gnu.org>
parents:
15484
diff
changeset
|
425 ;; Make sure the newline before point isn't intangible. |
8b2f2d10c40a
(newline): Don't do the optimization if the newline before point is
Miles Bader <miles@gnu.org>
parents:
15484
diff
changeset
|
426 (not (get-char-property (1- (point)) 'intangible)) |
8b2f2d10c40a
(newline): Don't do the optimization if the newline before point is
Miles Bader <miles@gnu.org>
parents:
15484
diff
changeset
|
427 ;; Make sure the newline before point isn't read-only. |
8b2f2d10c40a
(newline): Don't do the optimization if the newline before point is
Miles Bader <miles@gnu.org>
parents:
15484
diff
changeset
|
428 (not (get-char-property (1- (point)) 'read-only)) |
8b2f2d10c40a
(newline): Don't do the optimization if the newline before point is
Miles Bader <miles@gnu.org>
parents:
15484
diff
changeset
|
429 ;; Make sure the newline before point isn't invisible. |
8b2f2d10c40a
(newline): Don't do the optimization if the newline before point is
Miles Bader <miles@gnu.org>
parents:
15484
diff
changeset
|
430 (not (get-char-property (1- (point)) 'invisible)) |
8b2f2d10c40a
(newline): Don't do the optimization if the newline before point is
Miles Bader <miles@gnu.org>
parents:
15484
diff
changeset
|
431 ;; Make sure the newline before point has the same |
8b2f2d10c40a
(newline): Don't do the optimization if the newline before point is
Miles Bader <miles@gnu.org>
parents:
15484
diff
changeset
|
432 ;; properties as the char before it (if any). |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
433 (< (or (previous-property-change (point)) -2) |
11324
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
434 (- (point) 2)))) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
435 (was-page-start (and (bolp) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
436 (looking-at page-delimiter))) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
437 (beforepos (point))) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
438 (if flag (backward-char 1)) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
439 ;; Call self-insert so that auto-fill, abbrev expansion etc. happens. |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
440 ;; Set last-command-char to tell self-insert what to insert. |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
441 (let ((last-command-char ?\n) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
442 ;; Don't auto-fill if we have a numeric argument. |
11362
b51e4c4cb0de
(newline): Don't auto-fill if flag is on; it was filling wrong line.
Richard M. Stallman <rms@gnu.org>
parents:
11326
diff
changeset
|
443 ;; Also not if flag is true (it would fill wrong line); |
b51e4c4cb0de
(newline): Don't auto-fill if flag is on; it was filling wrong line.
Richard M. Stallman <rms@gnu.org>
parents:
11326
diff
changeset
|
444 ;; there is no need to since we're at BOL. |
b51e4c4cb0de
(newline): Don't auto-fill if flag is on; it was filling wrong line.
Richard M. Stallman <rms@gnu.org>
parents:
11326
diff
changeset
|
445 (auto-fill-function (if (or arg flag) nil auto-fill-function))) |
12400
9e7727cdbb68
(newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents:
12355
diff
changeset
|
446 (unwind-protect |
9e7727cdbb68
(newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents:
12355
diff
changeset
|
447 (self-insert-command (prefix-numeric-value arg)) |
9e7727cdbb68
(newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents:
12355
diff
changeset
|
448 ;; If we get an error in self-insert-command, put point at right place. |
9e7727cdbb68
(newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents:
12355
diff
changeset
|
449 (if flag (forward-char 1)))) |
21459
b787b88cc575
(newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents:
21222
diff
changeset
|
450 ;; Even if we did *not* get an error, keep that forward-char; |
b787b88cc575
(newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents:
21222
diff
changeset
|
451 ;; all further processing should apply to the newline that the user |
b787b88cc575
(newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents:
21222
diff
changeset
|
452 ;; thinks he inserted. |
b787b88cc575
(newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents:
21222
diff
changeset
|
453 |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
454 ;; Mark the newline(s) `hard'. |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
455 (if use-hard-newlines |
21459
b787b88cc575
(newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents:
21222
diff
changeset
|
456 (set-hard-newline-properties |
16018
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
457 (- (point) (if arg (prefix-numeric-value arg) 1)) (point))) |
11324
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
458 ;; If the newline leaves the previous line blank, |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
459 ;; and we have a left margin, delete that from the blank line. |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
460 (or flag |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
461 (save-excursion |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
462 (goto-char beforepos) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
463 (beginning-of-line) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
464 (and (looking-at "[ \t]$") |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
465 (> (current-left-margin) 0) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
466 (delete-region (point) (progn (end-of-line) (point)))))) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
467 ;; Indent the line after the newline, except in one case: |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
468 ;; when we added the newline at the beginning of a line |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
469 ;; which starts a page. |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
470 (or was-page-start |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
471 (move-to-left-margin nil t))) |
10863
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
472 nil) |
8e6b25e41a99
(newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents:
10854
diff
changeset
|
473 |
16018
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
474 (defun set-hard-newline-properties (from to) |
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
475 (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
|
476 (put-text-property from to 'hard 't) |
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
477 ;; 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
|
478 (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
|
479 (put-text-property from (point) 'rear-nonsticky |
9a12ac7707c9
(set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents:
15988
diff
changeset
|
480 (cons 'hard sticky))))) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
481 |
55425
1acbf23561f5
(next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55294
diff
changeset
|
482 (defun open-line (n) |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
483 "Insert a newline and leave point before it. |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
484 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
|
485 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
|
486 With arg N, insert N newlines." |
475 | 487 (interactive "*p") |
1063
25b929c06f83
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1039
diff
changeset
|
488 (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
|
489 (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
|
490 (loc (point)) |
e334380bbb2c
(next-line): Don't let `newline' expand abbrevs.
Gerd Moellmann <gerd@gnu.org>
parents:
35346
diff
changeset
|
491 ;; 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
|
492 (abbrev-mode nil)) |
55425
1acbf23561f5
(next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55294
diff
changeset
|
493 (newline n) |
11324
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
494 (goto-char loc) |
55425
1acbf23561f5
(next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55294
diff
changeset
|
495 (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
|
496 (cond ((bolp) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
497 (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
|
498 (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
|
499 (forward-line 1) |
55425
1acbf23561f5
(next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55294
diff
changeset
|
500 (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
|
501 (goto-char loc) |
3190c85854b6
(newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents:
11318
diff
changeset
|
502 (end-of-line))) |
475 | 503 |
49032
5dbb47300a5b
(split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents:
48984
diff
changeset
|
504 (defun split-line (&optional arg) |
5dbb47300a5b
(split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents:
48984
diff
changeset
|
505 "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
|
506 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
|
507 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
|
508 |
1acbf23561f5
(next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
55294
diff
changeset
|
509 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
|
510 (interactive "*P") |
475 | 511 (skip-chars-forward " \t") |
49066
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
512 (let* ((col (current-column)) |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
513 (pos (point)) |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
514 ;; 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
|
515 (prefix (cond ((stringp arg) arg) |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
516 (arg nil) |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
517 (t fill-prefix))) |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
518 ;; Does this line start with it? |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
519 (have-prfx (and prefix |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
520 (save-excursion |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
521 (beginning-of-line) |
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
522 (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
|
523 (newline 1) |
49066
d00c13d69d31
(split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents:
49032
diff
changeset
|
524 (if have-prfx (insert-and-inherit prefix)) |
475 | 525 (indent-to col 0) |
526 (goto-char pos))) | |
527 | |
528 (defun delete-indentation (&optional arg) | |
529 "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
|
530 If there is a fill prefix, delete it from the beginning of this line. |
475 | 531 With argument, join this line to following line." |
532 (interactive "*P") | |
533 (beginning-of-line) | |
534 (if arg (forward-line 1)) | |
535 (if (eq (preceding-char) ?\n) | |
536 (progn | |
537 (delete-region (point) (1- (point))) | |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
538 ;; If the second line started with the fill prefix, |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
539 ;; delete the prefix. |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
540 (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
|
541 (<= (+ (point) (length fill-prefix)) (point-max)) |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
542 (string= fill-prefix |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
543 (buffer-substring (point) |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
544 (+ (point) (length fill-prefix))))) |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
545 (delete-region (point) (+ (point) (length fill-prefix)))) |
475 | 546 (fixup-whitespace)))) |
547 | |
24078 | 548 (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
|
549 |
475 | 550 (defun delete-blank-lines () |
551 "On blank line, delete all surrounding blank lines, leaving just one. | |
552 On isolated blank line, delete that one. | |
7817
d729f75fff04
(delete-blank-lines): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
7762
diff
changeset
|
553 On nonblank line, delete any immediately following blank lines." |
475 | 554 (interactive "*") |
555 (let (thisblank singleblank) | |
556 (save-excursion | |
557 (beginning-of-line) | |
558 (setq thisblank (looking-at "[ \t]*$")) | |
715 | 559 ;; Set singleblank if there is just one blank line here. |
475 | 560 (setq singleblank |
561 (and thisblank | |
562 (not (looking-at "[ \t]*\n[ \t]*$")) | |
563 (or (bobp) | |
564 (progn (forward-line -1) | |
565 (not (looking-at "[ \t]*$"))))))) | |
715 | 566 ;; Delete preceding blank lines, and this one too if it's the only one. |
475 | 567 (if thisblank |
568 (progn | |
569 (beginning-of-line) | |
570 (if singleblank (forward-line 1)) | |
571 (delete-region (point) | |
572 (if (re-search-backward "[^ \t\n]" nil t) | |
573 (progn (forward-line 1) (point)) | |
574 (point-min))))) | |
715 | 575 ;; Delete following blank lines, unless the current line is blank |
576 ;; and there are no following blank lines. | |
475 | 577 (if (not (and thisblank singleblank)) |
578 (save-excursion | |
579 (end-of-line) | |
580 (forward-line 1) | |
581 (delete-region (point) | |
582 (if (re-search-forward "[^ \t\n]" nil t) | |
583 (progn (beginning-of-line) (point)) | |
715 | 584 (point-max))))) |
585 ;; Handle the special case where point is followed by newline and eob. | |
586 ;; Delete the line, leaving point at eob. | |
587 (if (looking-at "^[ \t]*\n\\'") | |
588 (delete-region (point) (point-max))))) | |
475 | 589 |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
590 (defun delete-trailing-whitespace () |
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
591 "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
|
592 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
|
593 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
|
594 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
|
595 (interactive "*") |
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
596 (save-match-data |
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
597 (save-excursion |
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
598 (goto-char (point-min)) |
34141
799f637fbc35
(delete-trailing-whitespace): Don't delete newlines too.
Miles Bader <miles@gnu.org>
parents:
34101
diff
changeset
|
599 (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
|
600 (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
|
601 ;; 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
|
602 (save-match-data |
08dafe901c44
(delete-trailing-whitespace): Save match data
Gerd Moellmann <gerd@gnu.org>
parents:
38432
diff
changeset
|
603 (if (looking-at ".*\f") |
08dafe901c44
(delete-trailing-whitespace): Save match data
Gerd Moellmann <gerd@gnu.org>
parents:
38432
diff
changeset
|
604 (goto-char (match-end 0)))) |
34619
237139766bdc
(delete-trailing-whitespace): Remove extraneous let.
Miles Bader <miles@gnu.org>
parents:
34570
diff
changeset
|
605 (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
|
606 |
475 | 607 (defun newline-and-indent () |
608 "Insert a newline, then indent according to major mode. | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
609 Indentation is done using the value of `indent-line-function'. |
475 | 610 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
|
611 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
|
612 column specified by the function `current-left-margin'." |
475 | 613 (interactive "*") |
34462
6a7373de926f
(delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents:
34443
diff
changeset
|
614 (delete-horizontal-space t) |
617 | 615 (newline) |
475 | 616 (indent-according-to-mode)) |
617 | |
618 (defun reindent-then-newline-and-indent () | |
619 "Reindent current line, insert newline, then indent the new line. | |
620 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
|
621 which means calling the current value of `indent-line-function'. |
475 | 622 In programming language modes, this is the same as TAB. |
623 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
|
624 column specified by the function `current-left-margin'." |
475 | 625 (interactive "*") |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
626 (let ((pos (point))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
627 ;; 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
|
628 ;; 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
|
629 (newline) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
630 (save-excursion |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
631 (goto-char pos) |
52944
ae9d36444079
(reindent-then-newline-and-indent): Delete space *after*
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52566
diff
changeset
|
632 (indent-according-to-mode) |
ae9d36444079
(reindent-then-newline-and-indent): Delete space *after*
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52566
diff
changeset
|
633 (delete-horizontal-space t)) |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
634 (indent-according-to-mode))) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
635 |
25292 | 636 (defun quoted-insert (arg) |
637 "Read next input character and insert it. | |
638 This is useful for inserting control characters. | |
639 | |
640 If the first character you type after this command is an octal digit, | |
641 you should type a sequence of octal digits which specify a character code. | |
642 Any nondigit terminates the sequence. If the terminator is a RET, | |
643 it is discarded; any other terminator is used itself as input. | |
644 The variable `read-quoted-char-radix' specifies the radix for this feature; | |
645 set it to 10 or 16 to use decimal or hex instead of octal. | |
646 | |
647 In overwrite mode, this function inserts the character anyway, and | |
648 does not handle octal digits specially. This means that if you use | |
649 overwrite as your normal editing mode, you can use this function to | |
650 insert characters when necessary. | |
651 | |
652 In binary overwrite mode, this function does overwrite, and octal | |
653 digits are interpreted as a character code. This is intended to be | |
654 useful for editing binary files." | |
655 (interactive "*p") | |
67181
b3df9252e4e8
(quoted-insert): Let-bind input-method-function to nil.
Juri Linkov <juri@jurta.org>
parents:
67155
diff
changeset
|
656 (let* ((char (let (translation-table-for-input input-method-function) |
48180
9b71fc12ed85
(quoted-insert): Bind keyboard-translate-table around
Dave Love <fx@gnu.org>
parents:
48013
diff
changeset
|
657 (if (or (not overwrite-mode) |
9b71fc12ed85
(quoted-insert): Bind keyboard-translate-table around
Dave Love <fx@gnu.org>
parents:
48013
diff
changeset
|
658 (eq overwrite-mode 'overwrite-mode-binary)) |
9b71fc12ed85
(quoted-insert): Bind keyboard-translate-table around
Dave Love <fx@gnu.org>
parents:
48013
diff
changeset
|
659 (read-quoted-char) |
9b71fc12ed85
(quoted-insert): Bind keyboard-translate-table around
Dave Love <fx@gnu.org>
parents:
48013
diff
changeset
|
660 (read-char))))) |
25292 | 661 ;; Assume character codes 0240 - 0377 stand for characters in some |
662 ;; single-byte character set, and convert them to Emacs | |
663 ;; characters. | |
664 (if (and enable-multibyte-characters | |
665 (>= char ?\240) | |
666 (<= char ?\377)) | |
667 (setq char (unibyte-char-to-multibyte char))) | |
668 (if (> arg 0) | |
669 (if (eq overwrite-mode 'overwrite-mode-binary) | |
670 (delete-char arg))) | |
671 (while (> arg 0) | |
672 (insert-and-inherit char) | |
673 (setq arg (1- arg))))) | |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
674 |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
675 (defun forward-to-indentation (&optional arg) |
25292 | 676 "Move forward ARG lines and position at first nonblank character." |
677 (interactive "p") | |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
678 (forward-line (or arg 1)) |
25292 | 679 (skip-chars-forward " \t")) |
680 | |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
681 (defun backward-to-indentation (&optional arg) |
25292 | 682 "Move backward ARG lines and position at first nonblank character." |
683 (interactive "p") | |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
684 (forward-line (- (or arg 1))) |
25292 | 685 (skip-chars-forward " \t")) |
686 | |
687 (defun back-to-indentation () | |
688 "Move point to the first non-whitespace character on this line." | |
689 (interactive) | |
690 (beginning-of-line 1) | |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
691 (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
|
692 ;; 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
|
693 (backward-prefix-chars)) |
25292 | 694 |
695 (defun fixup-whitespace () | |
696 "Fixup white space between objects around point. | |
697 Leave one space or none, according to the context." | |
698 (interactive "*") | |
699 (save-excursion | |
700 (delete-horizontal-space) | |
701 (if (or (looking-at "^\\|\\s)") | |
702 (save-excursion (forward-char -1) | |
703 (looking-at "$\\|\\s(\\|\\s'"))) | |
704 nil | |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
705 (insert ?\s)))) |
25292 | 706 |
34462
6a7373de926f
(delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents:
34443
diff
changeset
|
707 (defun delete-horizontal-space (&optional backward-only) |
6a7373de926f
(delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents:
34443
diff
changeset
|
708 "Delete all spaces and tabs around point. |
6a7373de926f
(delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents:
34443
diff
changeset
|
709 If BACKWARD-ONLY is non-nil, only delete spaces before point." |
25292 | 710 (interactive "*") |
37791
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
711 (let ((orig-pos (point))) |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
712 (delete-region |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
713 (if backward-only |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
714 orig-pos |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
715 (progn |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
716 (skip-chars-forward " \t") |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
717 (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
|
718 (progn |
37791
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
719 (skip-chars-backward " \t") |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
720 (constrain-to-field nil orig-pos))))) |
25292 | 721 |
59598
9782a4d3aef5
(just-one-space): Make arg optional.
Kim F. Storm <storm@cua.dk>
parents:
59567
diff
changeset
|
722 (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
|
723 "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
|
724 (interactive "*p") |
37791
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
725 (let ((orig-pos (point))) |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
726 (skip-chars-backward " \t") |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
727 (constrain-to-field nil orig-pos) |
59598
9782a4d3aef5
(just-one-space): Make arg optional.
Kim F. Storm <storm@cua.dk>
parents:
59567
diff
changeset
|
728 (dotimes (i (or n 1)) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
729 (if (= (following-char) ?\s) |
59567
638fd0a9f545
(just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents:
59486
diff
changeset
|
730 (forward-char 1) |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
731 (insert ?\s))) |
37791
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
732 (delete-region |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
733 (point) |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
734 (progn |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
735 (skip-chars-forward " \t") |
5bd4843858ae
(delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents:
37300
diff
changeset
|
736 (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
|
737 |
475 | 738 (defun beginning-of-buffer (&optional arg) |
739 "Move point to the beginning of the buffer; leave mark at previous position. | |
56432
af62749c9497
(inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
56378
diff
changeset
|
740 With \\[universal-argument] prefix, do not set mark at previous position. |
af62749c9497
(inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
56378
diff
changeset
|
741 With numeric arg N, put point N/10 of the way from the beginning. |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
742 |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
743 If the buffer is narrowed, this command uses the beginning and size |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
744 of the accessible part of the buffer. |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
745 |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
746 Don't use this command in Lisp programs! |
475 | 747 \(goto-char (point-min)) is faster and avoids clobbering the mark." |
748 (interactive "P") | |
58961
2a281af9d3ad
(inhibit-mark-movement): Remove defvar.
Kim F. Storm <storm@cua.dk>
parents:
58951
diff
changeset
|
749 (or (consp arg) |
58917
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
750 (and transient-mark-mode mark-active) |
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
751 (push-mark)) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
752 (let ((size (- (point-max) (point-min)))) |
56432
af62749c9497
(inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
56378
diff
changeset
|
753 (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
|
754 (+ (point-min) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
755 (if (> size 10000) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
756 ;; Avoid overflow for large buffer sizes! |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
757 (* (prefix-numeric-value arg) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
758 (/ size 10)) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
759 (/ (+ 10 (* size (prefix-numeric-value arg))) 10))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
760 (point-min)))) |
475 | 761 (if arg (forward-line 1))) |
762 | |
763 (defun end-of-buffer (&optional arg) | |
764 "Move point to the end of the buffer; leave mark at previous position. | |
56432
af62749c9497
(inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
56378
diff
changeset
|
765 With \\[universal-argument] prefix, do not set mark at previous position. |
af62749c9497
(inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
56378
diff
changeset
|
766 With numeric arg N, put point N/10 of the way from the end. |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
767 |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
768 If the buffer is narrowed, this command uses the beginning and size |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
769 of the accessible part of the buffer. |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
770 |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
771 Don't use this command in Lisp programs! |
475 | 772 \(goto-char (point-max)) is faster and avoids clobbering the mark." |
773 (interactive "P") | |
58961
2a281af9d3ad
(inhibit-mark-movement): Remove defvar.
Kim F. Storm <storm@cua.dk>
parents:
58951
diff
changeset
|
774 (or (consp arg) |
58917
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
775 (and transient-mark-mode mark-active) |
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
776 (push-mark)) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
777 (let ((size (- (point-max) (point-min)))) |
56432
af62749c9497
(inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents:
56378
diff
changeset
|
778 (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
|
779 (- (point-max) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
780 (if (> size 10000) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
781 ;; Avoid overflow for large buffer sizes! |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
782 (* (prefix-numeric-value arg) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
783 (/ size 10)) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
784 (/ (* size (prefix-numeric-value arg)) 10))) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
785 (point-max)))) |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
786 ;; 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
|
787 ;; adjust it to the beginning of a line. |
26265
bcd25953e4cf
(end-of-buffer): Use window-end to find the window end
Gerd Moellmann <gerd@gnu.org>
parents:
26201
diff
changeset
|
788 (cond (arg (forward-line 1)) |
39743
b6933b0f1ef2
(end-of-buffer): Fix code scrolling specially
Gerd Moellmann <gerd@gnu.org>
parents:
39612
diff
changeset
|
789 ((> (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
|
790 ;; 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
|
791 ;; 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
|
792 (overlay-recenter (point)) |
bcd25953e4cf
(end-of-buffer): Use window-end to find the window end
Gerd Moellmann <gerd@gnu.org>
parents:
26201
diff
changeset
|
793 (recenter -3)))) |
475 | 794 |
795 (defun mark-whole-buffer () | |
715 | 796 "Put point at beginning and mark at end of buffer. |
797 You probably should not use this function in Lisp programs; | |
798 it is usually a mistake for a Lisp function to use any subroutine | |
799 that uses or sets the mark." | |
475 | 800 (interactive) |
801 (push-mark (point)) | |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
802 (push-mark (point-max) nil t) |
475 | 803 (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
|
804 |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
805 |
25292 | 806 ;; Counting lines, one way or another. |
807 | |
60405
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
808 (defun goto-line (arg &optional buffer) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
809 "Goto line ARG, counting from line 1 at beginning of buffer. |
60744 | 810 Normally, move point in the current buffer. |
811 With just \\[universal-argument] as argument, move point in the most recently | |
812 displayed other buffer, and switch to it. When called from Lisp code, | |
813 the optional argument BUFFER specifies a buffer to switch to. | |
60405
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
814 |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
815 If there's a number in the buffer at point, it is the default for ARG." |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
816 (interactive |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
817 (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
|
818 (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
|
819 ;; 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
|
820 (let* ((default |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
821 (save-excursion |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
822 (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
|
823 (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
|
824 (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
|
825 (point) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
826 (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
|
827 (point)))))) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
828 ;; 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
|
829 (buffer |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
830 (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
|
831 (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
|
832 (buffer-prompt |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
833 (if buffer |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
834 (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
|
835 ""))) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
836 ;; 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
|
837 (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
|
838 "Goto line%s: ") |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
839 buffer-prompt |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
840 default) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
841 nil nil t |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
842 'minibuffer-history |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
843 default) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
844 buffer)))) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
845 ;; 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
|
846 (if buffer |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
847 (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
|
848 (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
|
849 (switch-to-buffer-other-window buffer)))) |
489c6114d10c
(goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents:
60176
diff
changeset
|
850 ;; Move to the specified line number in that buffer. |
25292 | 851 (save-restriction |
852 (widen) | |
853 (goto-char 1) | |
854 (if (eq selective-display t) | |
855 (re-search-forward "[\n\C-m]" nil 'end (1- arg)) | |
60409
469a1901dd91
(goto-line): Remove unbalanced final parenthesis.
Luc Teirlinck <teirllm@auburn.edu>
parents:
60405
diff
changeset
|
856 (forward-line (1- arg))))) |
475 | 857 |
858 (defun count-lines-region (start end) | |
3591
507f64624555
Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents:
3487
diff
changeset
|
859 "Print number of lines and characters in the region." |
475 | 860 (interactive "r") |
861 (message "Region has %d lines, %d characters" | |
862 (count-lines start end) (- end start))) | |
863 | |
864 (defun what-line () | |
12939
1fc5a2981547
(what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents:
12893
diff
changeset
|
865 "Print the current buffer line number and narrowed line number of point." |
475 | 866 (interactive) |
58754
b41534d7c63c
(blink-matching-open): Obey syntax-table text properties.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58625
diff
changeset
|
867 (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
|
868 (n (line-number-at-pos))) |
53677 | 869 (if (= start 1) |
870 (message "Line %d" n) | |
871 (save-excursion | |
872 (save-restriction | |
873 (widen) | |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
874 (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
|
875 (+ 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
|
876 |
475 | 877 (defun count-lines (start end) |
878 "Return number of lines between START and END. | |
879 This is usually the number of newlines between them, | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
880 but can be one more if START is not equal to END |
475 | 881 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
|
882 (save-excursion |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
883 (save-restriction |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
884 (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
|
885 (goto-char (point-min)) |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
886 (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
|
887 (save-match-data |
2421
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
888 (let ((done 0)) |
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
889 (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
|
890 (setq done (+ 40 done))) |
eb9815e0a71d
(count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents:
2416
diff
changeset
|
891 (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
|
892 (setq done (+ 1 done))) |
5151
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
893 (goto-char (point-max)) |
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
894 (if (and (/= start end) |
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
895 (not (bolp))) |
8b31cff02267
(count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents:
5135
diff
changeset
|
896 (1+ done) |
9554
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
897 done))) |
d3f3f3db986d
(count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents:
9539
diff
changeset
|
898 (- (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
|
899 |
53839
be1da5092aa4
(line-number-at-pos): Rename from line-at-pos.
Kim F. Storm <storm@cua.dk>
parents:
53767
diff
changeset
|
900 (defun line-number-at-pos (&optional pos) |
53677 | 901 "Return (narrowed) buffer line number at position POS. |
902 If POS is nil, use current buffer location." | |
903 (let ((opoint (or pos (point))) start) | |
904 (save-excursion | |
905 (goto-char (point-min)) | |
906 (setq start (point)) | |
907 (goto-char opoint) | |
908 (forward-line 0) | |
909 (1+ (count-lines start (point)))))) | |
910 | |
16999
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
911 (defun what-cursor-position (&optional detail) |
b22c4cee0207
(kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents:
16957
diff
changeset
|
912 "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
|
913 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
|
914 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
|
915 |
0f92ac490b66
* simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents:
24372
diff
changeset
|
916 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
|
917 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
|
918 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
|
919 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
|
920 byte, just \"...\" is shown. |
23963
c242e2dc93a9
(what-cursor-position): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
23944
diff
changeset
|
921 |
28896
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
922 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
|
923 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
|
924 (interactive "P") |
475 | 925 (let* ((char (following-char)) |
926 (beg (point-min)) | |
927 (end (point-max)) | |
928 (pos (point)) | |
929 (total (buffer-size)) | |
930 (percent (if (> total 50000) | |
931 ;; Avoid overflow from multiplying by 100! | |
932 (/ (+ (/ total 200) (1- pos)) (max (/ total 100) 1)) | |
933 (/ (+ (/ total 2) (* 100 (1- pos))) (max total 1)))) | |
934 (hscroll (if (= (window-hscroll) 0) | |
935 "" | |
936 (format " Hscroll=%d" (window-hscroll)))) | |
937 (col (current-column))) | |
938 (if (= pos end) | |
939 (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
|
940 (message "point=%d of %d (%d%%) <%d-%d> column=%d%s" |
475 | 941 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
|
942 (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
|
943 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
|
944 (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
|
945 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
|
946 (if (or (not coding) |
0f92ac490b66
* simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents:
24372
diff
changeset
|
947 (eq (coding-system-type coding) t)) |
0f92ac490b66
* simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents:
24372
diff
changeset
|
948 (setq coding default-buffer-file-coding-system)) |
24508
f9e613360d62
(what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents:
24419
diff
changeset
|
949 (if (not (char-valid-p char)) |
f9e613360d62
(what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents:
24419
diff
changeset
|
950 (setq encoding-msg |
67034
c6e50090a202
(what-cursor-position): Use Lisp-readable syntax for octal and hex.
Juri Linkov <juri@jurta.org>
parents:
66973
diff
changeset
|
951 (format "(%d, #o%o, #x%x, invalid)" char char char)) |
65862
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
952 ;; 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
|
953 ;; 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
|
954 ;; buffer substring covered by that property. |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
955 (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
|
956 (if display-prop |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
957 (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
|
958 (point-max)))) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
959 (if (< to (+ pos 4)) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
960 (setq under-display "") |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
961 (setq under-display "..." |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
962 to (+ pos 4))) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
963 (setq under-display |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
964 (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
|
965 under-display))) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
966 (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
|
967 (setq encoding-msg |
65862
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
968 (if display-prop |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
969 (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
|
970 (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
|
971 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
|
972 (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
|
973 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
|
974 (if encoded |
67034
c6e50090a202
(what-cursor-position): Use Lisp-readable syntax for octal and hex.
Juri Linkov <juri@jurta.org>
parents:
66973
diff
changeset
|
975 (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
|
976 char char char |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
977 (if (> (length encoded) 1) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
978 "..." |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
979 (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
|
980 (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
|
981 (if detail |
28896
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
982 ;; 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
|
983 (describe-char (point))) |
28896
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
984 (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
|
985 (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
|
986 (if (< char 256) |
8063bfbd8b08
(what-cursor-position): Show "(composed)" if the
Kenichi Handa <handa@m17n.org>
parents:
26744
diff
changeset
|
987 (single-key-description char) |
8063bfbd8b08
(what-cursor-position): Show "(composed)" if the
Kenichi Handa <handa@m17n.org>
parents:
26744
diff
changeset
|
988 (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
|
989 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
|
990 (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
|
991 (if enable-multibyte-characters |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
992 (if (< char 128) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
993 (single-key-description char) |
8b246680b846
(what-cursor-position): If the character is displayed
Kenichi Handa <handa@m17n.org>
parents:
65782
diff
changeset
|
994 (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
|
995 (single-key-description char)) |
28896
0c70e1541a95
(what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents:
28703
diff
changeset
|
996 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
|
997 |
31978
3a5e22f4cd99
(read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31573
diff
changeset
|
998 (defvar read-expression-map |
3a5e22f4cd99
(read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31573
diff
changeset
|
999 (let ((m (make-sparse-keymap))) |
3a5e22f4cd99
(read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31573
diff
changeset
|
1000 (define-key m "\M-\t" 'lisp-complete-symbol) |
3a5e22f4cd99
(read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31573
diff
changeset
|
1001 (set-keymap-parent m minibuffer-local-map) |
3a5e22f4cd99
(read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31573
diff
changeset
|
1002 m) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1003 "Minibuffer keymap used for reading Lisp expressions.") |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1004 |
4289
4d0c57f01eed
(read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents:
4287
diff
changeset
|
1005 (defvar read-expression-history nil) |
4d0c57f01eed
(read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents:
4287
diff
changeset
|
1006 |
25702
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1007 (defcustom eval-expression-print-level 4 |
63022
5e1ac4f79779
(eval-expression-print-level)
Luc Teirlinck <teirllm@auburn.edu>
parents:
62987
diff
changeset
|
1008 "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
|
1009 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
|
1010 :group 'lisp |
42128 | 1011 :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
|
1012 :version "21.1") |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1013 |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1014 (defcustom eval-expression-print-length 12 |
63022
5e1ac4f79779
(eval-expression-print-level)
Luc Teirlinck <teirllm@auburn.edu>
parents:
62987
diff
changeset
|
1015 "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
|
1016 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
|
1017 :group 'lisp |
42128 | 1018 :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
|
1019 :version "21.1") |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1020 |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1021 (defcustom eval-expression-debug-on-error t |
63022
5e1ac4f79779
(eval-expression-print-level)
Luc Teirlinck <teirllm@auburn.edu>
parents:
62987
diff
changeset
|
1022 "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
|
1023 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
|
1024 :group 'lisp |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1025 :type 'boolean |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1026 :version "21.1") |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1027 |
55799
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1028 (defun eval-expression-print-format (value) |
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1029 "Format VALUE as a result of evaluated expression. |
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1030 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
|
1031 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
|
1032 display the result of expression evaluation." |
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1033 (if (and (integerp value) |
56005
54d79ab53dd3
(eval-expression-print-format): Don't print additional
Juri Linkov <juri@jurta.org>
parents:
55975
diff
changeset
|
1034 (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
|
1035 (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
|
1036 (if (boundp 'edebug-active) edebug-active))) |
55799
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1037 (let ((char-string |
60007
bfdc24654127
(eval-expression-print-format): Avoid warning about edebug-active.
Richard M. Stallman <rms@gnu.org>
parents:
59996
diff
changeset
|
1038 (if (or (if (boundp 'edebug-active) edebug-active) |
56005
54d79ab53dd3
(eval-expression-print-format): Don't print additional
Juri Linkov <juri@jurta.org>
parents:
55975
diff
changeset
|
1039 (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
|
1040 (prin1-char value)))) |
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1041 (if char-string |
66595
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
1042 (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
|
1043 (format " (#o%o, #x%x)" value value))))) |
55799
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1044 |
4289
4d0c57f01eed
(read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents:
4287
diff
changeset
|
1045 ;; We define this, rather than making `eval' interactive, |
475 | 1046 ;; for the sake of completion of names like eval-region, eval-current-buffer. |
19514
9f6b375ce842
(eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19362
diff
changeset
|
1047 (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
|
1048 &optional eval-expression-insert-value) |
36021 | 1049 "Evaluate EVAL-EXPRESSION-ARG and print value in the echo area. |
1050 Value is also consed on to front of the variable `values'. | |
1051 Optional argument EVAL-EXPRESSION-INSERT-VALUE, if non-nil, means | |
1052 insert the result into the current buffer instead of printing it in | |
69852
a4e59f3e040c
(eval-expression): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
69602
diff
changeset
|
1053 the echo area. |
a4e59f3e040c
(eval-expression): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
69602
diff
changeset
|
1054 |
a4e59f3e040c
(eval-expression): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
69602
diff
changeset
|
1055 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
|
1056 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
|
1057 (interactive |
5068
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
1058 (list (read-from-minibuffer "Eval: " |
9a42f23df119
(eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents:
4894
diff
changeset
|
1059 nil read-expression-map t |
19514
9f6b375ce842
(eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19362
diff
changeset
|
1060 'read-expression-history) |
9f6b375ce842
(eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
19362
diff
changeset
|
1061 current-prefix-arg)) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
1062 |
27302
1cb6c18c3163
(eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents:
27298
diff
changeset
|
1063 (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
|
1064 (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
|
1065 (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
|
1066 ;; 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
|
1067 ;; 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
|
1068 (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
|
1069 (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
|
1070 (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
|
1071 ;; 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
|
1072 ;; 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
|
1073 (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
|
1074 (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
|
1075 |
25702
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1076 (let ((print-length eval-expression-print-length) |
2b96c6e05f23
(eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
25490
diff
changeset
|
1077 (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
|
1078 (if eval-expression-insert-value |
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
1079 (with-no-warnings |
52566
38d8d37f129a
(eval-expression): Bind standard-output in to-buffer case.
Richard M. Stallman <rms@gnu.org>
parents:
52464
diff
changeset
|
1080 (let ((standard-output (current-buffer))) |
38d8d37f129a
(eval-expression): Bind standard-output in to-buffer case.
Richard M. Stallman <rms@gnu.org>
parents:
52464
diff
changeset
|
1081 (eval-last-sexp-print-value (car values)))) |
55799
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1082 (prog1 |
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1083 (prin1 (car values) t) |
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1084 (let ((str (eval-expression-print-format (car values)))) |
85609e1fa661
(eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents:
55755
diff
changeset
|
1085 (if str (princ str t))))))) |
475 | 1086 |
1087 (defun edit-and-eval-command (prompt command) | |
1088 "Prompting with PROMPT, let user edit COMMAND and eval result. | |
1089 COMMAND is a Lisp expression. Let user edit that expression in | |
1090 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
|
1091 (let ((command |
53767
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1092 (let ((print-level nil) |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1093 (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
|
1094 (unwind-protect |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1095 (read-from-minibuffer prompt |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1096 (prin1-to-string command) |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1097 read-expression-map t |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1098 'command-history) |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1099 ;; 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
|
1100 ;; 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
|
1101 (if (stringp (car command-history)) |
6cac586a9c3d
(edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents:
53677
diff
changeset
|
1102 (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
|
1103 |
53e092e189c6
(edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents:
9554
diff
changeset
|
1104 ;; 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
|
1105 ;; 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
|
1106 (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
|
1107 (setq command-history (cons command command-history))) |
475 | 1108 (eval command))) |
1109 | |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1110 (defun repeat-complex-command (arg) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1111 "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
|
1112 A complex command is one which used the minibuffer. |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1113 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
|
1114 The result is executed, repeating the command as changed. |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1115 If the command has been changed or is not the most recent previous command |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1116 it is added to the front of the command history. |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1117 You can use the minibuffer history commands \\<minibuffer-local-map>\\[next-history-element] and \\[previous-history-element] |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1118 to get different commands to edit and resubmit." |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1119 (interactive "p") |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1120 (let ((elt (nth (1- arg) command-history)) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1121 newcmd) |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1122 (if elt |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1123 (progn |
4821
2c16f99ef5dc
(edit-and-eval-command): Let `read-from-minibuffer' manipulate the
Brian Fox <bfox@gnu.org>
parents:
4765
diff
changeset
|
1124 (setq newcmd |
16803
3d4a27ecfba9
(repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents:
16723
diff
changeset
|
1125 (let ((print-level nil) |
3d4a27ecfba9
(repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents:
16723
diff
changeset
|
1126 (minibuffer-history-position arg) |
20022
c9ed682ff86f
(previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents:
19888
diff
changeset
|
1127 (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
|
1128 (unwind-protect |
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1129 (read-from-minibuffer |
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1130 "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
|
1131 (cons 'command-history arg)) |
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1132 |
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1133 ;; 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
|
1134 ;; 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
|
1135 ;; evaluable expressions there. |
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1136 (if (stringp (car command-history)) |
1362c8e5d501
(edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
47464
diff
changeset
|
1137 (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
|
1138 |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
1139 ;; 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
|
1140 ;; add it to the history. |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
1141 (or (equal newcmd (car command-history)) |
b8731641d26a
(repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents:
5068
diff
changeset
|
1142 (setq command-history (cons newcmd command-history))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1143 (eval newcmd)) |
48984
13c2502ecdc8
(repeat-complex-command): Signal real error on failure.
Richard M. Stallman <rms@gnu.org>
parents:
48628
diff
changeset
|
1144 (if command-history |
13c2502ecdc8
(repeat-complex-command): Signal real error on failure.
Richard M. Stallman <rms@gnu.org>
parents:
48628
diff
changeset
|
1145 (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
|
1146 (error "There are no previous complex commands to repeat"))))) |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
1147 |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1148 (defvar minibuffer-history nil |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1149 "Default minibuffer history list. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1150 This is used for all minibuffer input |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1151 except when an alternate history list is specified.") |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1152 (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
|
1153 "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
|
1154 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
|
1155 they are expressions; otherwise they are strings. |
67777
8eda669e2619
(get-next-valid-buffer, last-buffer)
Juri Linkov <juri@jurta.org>
parents:
67621
diff
changeset
|
1156 \(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
|
1157 recursive uses of the minibuffer.)") |
862
46630543d659
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
859
diff
changeset
|
1158 (setq minibuffer-history-variable 'minibuffer-history) |
70488 | 1159 (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
|
1160 (defvar minibuffer-history-search-history nil) |
858
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
1161 |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1162 (defvar minibuffer-text-before-history nil |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1163 "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
|
1164 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
|
1165 in this use of the minibuffer.") |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1166 |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1167 (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
|
1168 |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1169 (defun minibuffer-history-initialize () |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1170 (setq minibuffer-text-before-history nil)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1171 |
33683
8fc77111dd98
(minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents:
33352
diff
changeset
|
1172 (defun minibuffer-avoid-prompt (new old) |
8fc77111dd98
(minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents:
33352
diff
changeset
|
1173 "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
|
1174 (constrain-to-field nil (point-max))) |
8fc77111dd98
(minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents:
33352
diff
changeset
|
1175 |
22257
23e2e03f2bf6
(minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22157
diff
changeset
|
1176 (defcustom minibuffer-history-case-insensitive-variables nil |
23e2e03f2bf6
(minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22157
diff
changeset
|
1177 "*Minibuffer history variables for which matching should ignore case. |
23e2e03f2bf6
(minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22157
diff
changeset
|
1178 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
|
1179 \\[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
|
1180 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
|
1181 :type '(repeat variable) |
23e2e03f2bf6
(minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22157
diff
changeset
|
1182 :group 'minibuffer) |
23e2e03f2bf6
(minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22157
diff
changeset
|
1183 |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1184 (defun previous-matching-history-element (regexp n) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1185 "Find the previous history element that matches REGEXP. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1186 \(Previous history elements refer to earlier actions.) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1187 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
|
1188 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
|
1189 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
|
1190 `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
|
1191 makes the search case-sensitive. |
22257
23e2e03f2bf6
(minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents:
22157
diff
changeset
|
1192 See also `minibuffer-history-case-insensitive-variables'." |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1193 (interactive |
2681
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1194 (let* ((enable-recursive-minibuffers t) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1195 (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
|
1196 nil |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1197 minibuffer-local-map |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1198 nil |
56081
a72ee0aaa7f9
(previous-matching-history-element): Specify a default.
Richard M. Stallman <rms@gnu.org>
parents:
56005
diff
changeset
|
1199 'minibuffer-history-search-history |
a72ee0aaa7f9
(previous-matching-history-element): Specify a default.
Richard M. Stallman <rms@gnu.org>
parents:
56005
diff
changeset
|
1200 (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
|
1201 ;; 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
|
1202 (list (if (string= regexp "") |
11961
b5efbe330c86
(previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents:
11572
diff
changeset
|
1203 (if minibuffer-history-search-history |
b5efbe330c86
(previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents:
11572
diff
changeset
|
1204 (car minibuffer-history-search-history) |
b5efbe330c86
(previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents:
11572
diff
changeset
|
1205 (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
|
1206 regexp) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1207 (prefix-numeric-value current-prefix-arg)))) |
32897
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1208 (unless (zerop n) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1209 (if (and (zerop minibuffer-history-position) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1210 (null minibuffer-text-before-history)) |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
1211 (setq minibuffer-text-before-history |
39612
309d26eb8616
(previous-matching-history-element): Fix misplaced parentheses.
Miles Bader <miles@gnu.org>
parents:
39597
diff
changeset
|
1212 (minibuffer-contents-no-properties))) |
32897
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1213 (let ((history (symbol-value minibuffer-history-variable)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1214 (case-fold-search |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1215 (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
|
1216 ;; On some systems, ignore case for file names. |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1217 (if (memq minibuffer-history-variable |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1218 minibuffer-history-case-insensitive-variables) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1219 t |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1220 ;; Respect the user's setting for case-fold-search: |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1221 case-fold-search) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1222 nil)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1223 prevpos |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1224 match-string |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1225 match-offset |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1226 (pos minibuffer-history-position)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1227 (while (/= n 0) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1228 (setq prevpos pos) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1229 (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
|
1230 (when (= pos prevpos) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1231 (error (if (= pos 1) |
892
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
1232 "No later matching history item" |
3a9943a4a440
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
874
diff
changeset
|
1233 "No earlier matching history item"))) |
32897
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1234 (setq match-string |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1235 (if (eq minibuffer-history-sexp-flag (minibuffer-depth)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1236 (let ((print-level nil)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1237 (prin1-to-string (nth (1- pos) history))) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1238 (nth (1- pos) history))) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1239 (setq match-offset |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1240 (if (< n 0) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1241 (and (string-match regexp match-string) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1242 (match-end 0)) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1243 (and (string-match (concat ".*\\(" regexp "\\)") match-string) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1244 (match-beginning 1)))) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1245 (when match-offset |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1246 (setq n (+ n (if (< n 0) 1 -1))))) |
32897
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1247 (setq minibuffer-history-position pos) |
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1248 (goto-char (point-max)) |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
1249 (delete-minibuffer-contents) |
32897
99da951a3b7f
(previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents:
32507
diff
changeset
|
1250 (insert match-string) |
39612
309d26eb8616
(previous-matching-history-element): Fix misplaced parentheses.
Miles Bader <miles@gnu.org>
parents:
39597
diff
changeset
|
1251 (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
|
1252 (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
|
1253 next-matching-history-element)) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1254 (setq command-history (cdr command-history)))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1255 |
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1256 (defun next-matching-history-element (regexp n) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1257 "Find the next history element that matches REGEXP. |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1258 \(The next history element refers to a more recent action.) |
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1259 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
|
1260 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
|
1261 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
|
1262 `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
|
1263 makes the search case-sensitive." |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1264 (interactive |
2681
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1265 (let* ((enable-recursive-minibuffers t) |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1266 (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
|
1267 nil |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1268 minibuffer-local-map |
9ebd08f578f0
(previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents:
2669
diff
changeset
|
1269 nil |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1270 'minibuffer-history-search-history |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1271 (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
|
1272 ;; 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
|
1273 (list (if (string= regexp "") |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1274 (if minibuffer-history-search-history |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1275 (car minibuffer-history-search-history) |
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1276 (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
|
1277 regexp) |
1135
e33f6475229a
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
1063
diff
changeset
|
1278 (prefix-numeric-value current-prefix-arg)))) |
874
b945f592b94d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
870
diff
changeset
|
1279 (previous-matching-history-element regexp (- n))) |
475 | 1280 |
32105
f80262435e6c
(minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents:
31978
diff
changeset
|
1281 (defvar minibuffer-temporary-goal-position nil) |
f80262435e6c
(minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents:
31978
diff
changeset
|
1282 |
858
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
1283 (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
|
1284 "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
|
1285 With argument N, it uses the Nth following element." |
475 | 1286 (interactive "p") |
10722
8ba6f9709cff
(next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents:
10597
diff
changeset
|
1287 (or (zerop n) |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1288 (let ((narg (- minibuffer-history-position n)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1289 (minimum (if minibuffer-default -1 0)) |
24814 | 1290 elt minibuffer-returned-to-present) |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1291 (if (and (zerop minibuffer-history-position) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1292 (null minibuffer-text-before-history)) |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
1293 (setq minibuffer-text-before-history |
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
1294 (minibuffer-contents-no-properties))) |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1295 (if (< narg minimum) |
23472
d75fa19c5fc0
(next-history-element): Special error message if no default.
Richard M. Stallman <rms@gnu.org>
parents:
23471
diff
changeset
|
1296 (if minibuffer-default |
d75fa19c5fc0
(next-history-element): Special error message if no default.
Richard M. Stallman <rms@gnu.org>
parents:
23471
diff
changeset
|
1297 (error "End of history; no next item") |
d75fa19c5fc0
(next-history-element): Special error message if no default.
Richard M. Stallman <rms@gnu.org>
parents:
23471
diff
changeset
|
1298 (error "End of history; no default available"))) |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1299 (if (> narg (length (symbol-value minibuffer-history-variable))) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1300 (error "Beginning of history; no preceding item")) |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
1301 (unless (memq last-command '(next-history-element |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
1302 previous-history-element)) |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
1303 (let ((prompt-end (minibuffer-prompt-end))) |
32105
f80262435e6c
(minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents:
31978
diff
changeset
|
1304 (set (make-local-variable 'minibuffer-temporary-goal-position) |
f80262435e6c
(minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents:
31978
diff
changeset
|
1305 (cond ((<= (point) prompt-end) prompt-end) |
f80262435e6c
(minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents:
31978
diff
changeset
|
1306 ((eobp) nil) |
f80262435e6c
(minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents:
31978
diff
changeset
|
1307 (t (point)))))) |
26054 | 1308 (goto-char (point-max)) |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
1309 (delete-minibuffer-contents) |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1310 (setq minibuffer-history-position narg) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1311 (cond ((= narg -1) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1312 (setq elt minibuffer-default)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1313 ((= narg 0) |
19888
45a077538366
(next-history-element):
Richard M. Stallman <rms@gnu.org>
parents:
19514
diff
changeset
|
1314 (setq elt (or minibuffer-text-before-history "")) |
24814 | 1315 (setq minibuffer-returned-to-present t) |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1316 (setq minibuffer-text-before-history nil)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1317 (t (setq elt (nth (1- minibuffer-history-position) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1318 (symbol-value minibuffer-history-variable))))) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1319 (insert |
24814 | 1320 (if (and (eq minibuffer-history-sexp-flag (minibuffer-depth)) |
1321 (not minibuffer-returned-to-present)) | |
17662
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1322 (let ((print-level nil)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1323 (prin1-to-string elt)) |
9b1b6974b36f
(minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
17613
diff
changeset
|
1324 elt)) |
32105
f80262435e6c
(minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents:
31978
diff
changeset
|
1325 (goto-char (or minibuffer-temporary-goal-position (point-max)))))) |
475 | 1326 |
858
b11800dc877d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
846
diff
changeset
|
1327 (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
|
1328 "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
|
1329 With argument N, it uses the Nth previous element." |
475 | 1330 (interactive "p") |
859
5f325fbc093d
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
858
diff
changeset
|
1331 (next-history-element (- n))) |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
1332 |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
1333 (defun next-complete-history-element (n) |
26054 | 1334 "Get next history element which completes the minibuffer before the point. |
1335 The contents of the minibuffer after the point are deleted, and replaced | |
1336 by the new completion." | |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
1337 (interactive "p") |
1826
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
1338 (let ((point-at-start (point))) |
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
1339 (next-matching-history-element |
26054 | 1340 (concat |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
1341 "^" (regexp-quote (buffer-substring (minibuffer-prompt-end) (point)))) |
26054 | 1342 n) |
1826
6ca05c5f8979
(next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents:
1824
diff
changeset
|
1343 ;; 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
|
1344 ;; 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
|
1345 ;; 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
|
1346 (goto-char point-at-start))) |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
1347 |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
1348 (defun previous-complete-history-element (n) |
5324
f091cdec77e2
(next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5151
diff
changeset
|
1349 "\ |
26054 | 1350 Get previous history element which completes the minibuffer before the point. |
1351 The contents of the minibuffer after the point are deleted, and replaced | |
1352 by the new completion." | |
1811
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
1353 (interactive "p") |
3e4f8b1da4e9
({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents:
1771
diff
changeset
|
1354 (next-complete-history-element (- n))) |
26054 | 1355 |
39597
d92e65cccff6
(previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents:
39289
diff
changeset
|
1356 ;; For compatibility with the old subr of the same name. |
26054 | 1357 (defun minibuffer-prompt-width () |
1358 "Return the display width of the minibuffer prompt. | |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
1359 Return 0 if current buffer is not a minibuffer." |
26054 | 1360 ;; Return the width of everything before the field at the end of |
1361 ;; 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
|
1362 (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
|
1363 |
475 | 1364 ;Put this on C-x u, so we can force that rather than C-_ into startup msg |
16436
d2acc84badf4
Use defalias not define-function.
Richard M. Stallman <rms@gnu.org>
parents:
16417
diff
changeset
|
1365 (defalias 'advertised-undo 'undo) |
475 | 1366 |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1367 (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
|
1368 "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
|
1369 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
|
1370 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
|
1371 |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1372 (defvar undo-in-region nil |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1373 "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
|
1374 |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1375 (defvar undo-no-redo nil |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1376 "If t, `undo' doesn't go through redo entries.") |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1377 |
59782
ec7c04e04f71
(undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents:
59701
diff
changeset
|
1378 (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
|
1379 "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
|
1380 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
|
1381 |
475 | 1382 (defun undo (&optional arg) |
1383 "Undo some previous changes. | |
1384 Repeat this command to undo more changes. | |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1385 A numeric argument serves as a repeat count. |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1386 |
32899
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
1387 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
|
1388 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
|
1389 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
|
1390 (interactive "*P") |
41996
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1391 ;; 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
|
1392 ;; 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
|
1393 ;; 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
|
1394 ;; 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
|
1395 ;; 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
|
1396 ;; 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
|
1397 (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
|
1398 (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
|
1399 message) |
54259
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
1400 ;; 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
|
1401 ;; 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
|
1402 ;; 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
|
1403 (setq this-command 'undo-start) |
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
1404 |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1405 (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
|
1406 (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
|
1407 ;; 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
|
1408 ;; 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
|
1409 (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
|
1410 (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
|
1411 (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
|
1412 ;; 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
|
1413 ;; 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
|
1414 (gethash list undo-equiv-table)))) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1415 (setq undo-in-region |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1416 (if transient-mark-mode mark-active (and arg (not (numberp arg))))) |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1417 (if undo-in-region |
32899
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
1418 (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
|
1419 (undo-start)) |
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
1420 ;; 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
|
1421 (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
|
1422 ;; 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
|
1423 (setq this-command 'undo) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1424 ;; 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
|
1425 ;; 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
|
1426 (let ((equiv (gethash pending-undo-list undo-equiv-table))) |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1427 (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
|
1428 (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
|
1429 (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
|
1430 (if equiv "Redo!" "Undo!")))) |
61531
34b31319dc9b
(undo): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
61469
diff
changeset
|
1431 (when (and (consp equiv) undo-no-redo) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1432 ;; 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
|
1433 ;; 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
|
1434 (while (let ((next (gethash equiv undo-equiv-table))) |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1435 (if next (setq equiv next)))) |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1436 (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
|
1437 (undo-more |
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
1438 (if (or transient-mark-mode (numberp arg)) |
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
1439 (prefix-numeric-value arg) |
5e2b0129cfde
(undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents:
32897
diff
changeset
|
1440 1)) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1441 ;; 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
|
1442 ;; 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
|
1443 ;; 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
|
1444 ;; record to the following undos. |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1445 ;; I don't know how to do that in the undo-in-region case. |
61469
d971c29e6cb4
(undo): Record t in undo-equiv-table
Richard M. Stallman <rms@gnu.org>
parents:
61361
diff
changeset
|
1446 (puthash buffer-undo-list |
d971c29e6cb4
(undo): Record t in undo-equiv-table
Richard M. Stallman <rms@gnu.org>
parents:
61361
diff
changeset
|
1447 (if undo-in-region t pending-undo-list) |
d971c29e6cb4
(undo): Record t in undo-equiv-table
Richard M. Stallman <rms@gnu.org>
parents:
61361
diff
changeset
|
1448 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
|
1449 ;; 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
|
1450 ;; 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
|
1451 (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
|
1452 (prev nil)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1453 (while (car tail) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1454 (when (integerp (car tail)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1455 (let ((pos (car tail))) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1456 (if prev |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1457 (setcdr prev (cdr tail)) |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1458 (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
|
1459 (setq tail (cdr tail)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1460 (while (car tail) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1461 (if (eq pos (car tail)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1462 (if prev |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1463 (setcdr prev (cdr tail)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1464 (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
|
1465 (setq prev tail)) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1466 (setq tail (cdr tail))) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1467 (setq tail nil))) |
34a21edb136e
(undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents:
39110
diff
changeset
|
1468 (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
|
1469 ;; 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
|
1470 ;; so the next command can tell if the buffer was modified in between. |
475 | 1471 (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
|
1472 (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
|
1473 ;; Display a message announcing success. |
ef5c1ec14e1f
(undo): Display message at end, not at start.
Richard M. Stallman <rms@gnu.org>
parents:
66405
diff
changeset
|
1474 (if message |
ef5c1ec14e1f
(undo): Display message at end, not at start.
Richard M. Stallman <rms@gnu.org>
parents:
66405
diff
changeset
|
1475 (message message)))) |
475 | 1476 |
59127
25e00b2ef82f
(next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents:
59055
diff
changeset
|
1477 (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
|
1478 "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
|
1479 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
|
1480 (interactive) |
59162
ced0821d5f7c
(buffer-disable-undo): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents:
59157
diff
changeset
|
1481 (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
|
1482 (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
|
1483 |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1484 (defun undo-only (&optional arg) |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1485 "Undo some previous changes. |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1486 Repeat this command to undo more changes. |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1487 A numeric argument serves as a repeat count. |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1488 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
|
1489 (interactive "*p") |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1490 (let ((undo-no-redo t)) (undo arg))) |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1491 |
22725
6d0f7798f157
(undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22375
diff
changeset
|
1492 (defvar undo-in-progress nil |
6d0f7798f157
(undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22375
diff
changeset
|
1493 "Non-nil while performing an undo. |
6d0f7798f157
(undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22375
diff
changeset
|
1494 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
|
1495 |
63487
eb15f8c9bc85
(undo-more): Don't use `format' on `error' arguments. Improve
Juanma Barranquero <lekktu@gmail.com>
parents:
63485
diff
changeset
|
1496 (defun undo-more (n) |
475 | 1497 "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
|
1498 Call `undo-start' to get ready to undo recent changes, |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
1499 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
|
1500 (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
|
1501 (error (concat "No further undo information" |
eb15f8c9bc85
(undo-more): Don't use `format' on `error' arguments. Improve
Juanma Barranquero <lekktu@gmail.com>
parents:
63485
diff
changeset
|
1502 (and transient-mark-mode mark-active |
eb15f8c9bc85
(undo-more): Don't use `format' on `error' arguments. Improve
Juanma Barranquero <lekktu@gmail.com>
parents:
63485
diff
changeset
|
1503 " for region")))) |
22725
6d0f7798f157
(undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22375
diff
changeset
|
1504 (let ((undo-in-progress t)) |
63487
eb15f8c9bc85
(undo-more): Don't use `format' on `error' arguments. Improve
Juanma Barranquero <lekktu@gmail.com>
parents:
63485
diff
changeset
|
1505 (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
|
1506 (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
|
1507 (setq pending-undo-list t)))) |
475 | 1508 |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1509 ;; Deep copy of a list |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1510 (defun undo-copy-list (list) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1511 "Make a copy of undo list LIST." |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1512 (mapcar 'undo-copy-list-1 list)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1513 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1514 (defun undo-copy-list-1 (elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1515 (if (consp elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1516 (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
|
1517 elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1518 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1519 (defun undo-start (&optional beg end) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1520 "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
|
1521 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
|
1522 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
|
1523 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
|
1524 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
|
1525 (if (eq buffer-undo-list t) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1526 (error "No undo information in this buffer")) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1527 (setq pending-undo-list |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1528 (if (and beg end (not (= beg end))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1529 (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
|
1530 buffer-undo-list))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1531 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1532 (defvar undo-adjusted-markers) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1533 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1534 (defun undo-make-selective-list (start end) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1535 "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
|
1536 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
|
1537 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
|
1538 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
|
1539 we stop and ignore all further elements." |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1540 (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
|
1541 (undo-list (list nil)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1542 undo-adjusted-markers |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1543 some-rejected |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1544 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
|
1545 (while undo-list-copy |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1546 (setq undo-elt (car undo-list-copy)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1547 (let ((keep-this |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1548 (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
|
1549 ;; This is a "was unmodified" element. |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1550 ;; 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
|
1551 (not some-rejected)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1552 (t |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1553 (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
|
1554 (if keep-this |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1555 (progn |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1556 (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
|
1557 ;; 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
|
1558 (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
|
1559 (eq undo-elt nil))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1560 (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
|
1561 (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
|
1562 (setq undo-list-copy nil) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1563 (setq some-rejected t) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1564 (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
|
1565 (setq delta (undo-delta undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1566 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1567 (when (/= (cdr delta) 0) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1568 (let ((position (car delta)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1569 (offset (cdr delta))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1570 |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
1571 ;; 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
|
1572 ;; 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
|
1573 ;; 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
|
1574 ;; 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
|
1575 ;; 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
|
1576 ;; output |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1577 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1578 (while temp-undo-list |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1579 (setq undo-elt (car temp-undo-list)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1580 (cond ((integerp undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1581 (if (>= undo-elt position) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1582 (setcar temp-undo-list (- undo-elt offset)))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1583 ((atom undo-elt) nil) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1584 ((stringp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1585 ;; (TEXT . POSITION) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1586 (let ((text-pos (abs (cdr undo-elt))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1587 (point-at-end (< (cdr undo-elt) 0 ))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1588 (if (>= text-pos position) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1589 (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
|
1590 (- text-pos offset)))))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1591 ((integerp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1592 ;; (BEGIN . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1593 (when (>= (car undo-elt) position) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1594 (setcar undo-elt (- (car undo-elt) offset)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1595 (setcdr undo-elt (- (cdr undo-elt) offset)))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1596 ((null (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1597 ;; (nil PROPERTY VALUE BEG . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1598 (let ((tail (nthcdr 3 undo-elt))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1599 (when (>= (car tail) position) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1600 (setcar tail (- (car tail) offset)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1601 (setcdr tail (- (cdr tail) offset)))))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1602 (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
|
1603 (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
|
1604 (nreverse undo-list))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1605 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1606 (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
|
1607 "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
|
1608 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
|
1609 (cond ((integerp undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1610 (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
|
1611 (<= undo-elt end))) |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1612 ((eq undo-elt nil) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1613 t) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1614 ((atom undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1615 nil) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1616 ((stringp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1617 ;; (TEXT . POSITION) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1618 (and (>= (abs (cdr undo-elt)) start) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1619 (< (abs (cdr undo-elt)) end))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1620 ((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
|
1621 ;; 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
|
1622 ;; See if MARKER is inside the region. |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1623 (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
|
1624 (unless alist-elt |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1625 (setq alist-elt (cons (car undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1626 (marker-position (car undo-elt)))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1627 (setq undo-adjusted-markers |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1628 (cons alist-elt undo-adjusted-markers))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1629 (and (cdr alist-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1630 (>= (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
|
1631 (<= (cdr alist-elt) end)))) |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1632 ((null (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1633 ;; (nil PROPERTY VALUE BEG . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1634 (let ((tail (nthcdr 3 undo-elt))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1635 (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
|
1636 (<= (cdr tail) end)))) |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1637 ((integerp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1638 ;; (BEGIN . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1639 (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
|
1640 (<= (cdr undo-elt) end))))) |
21175
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1641 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1642 (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
|
1643 "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
|
1644 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
|
1645 is not *inside* the region START...END." |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1646 (cond ((atom undo-elt) nil) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1647 ((null (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1648 ;; (nil PROPERTY VALUE BEG . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1649 (let ((tail (nthcdr 3 undo-elt))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1650 (not (or (< (car tail) end) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1651 (> (cdr tail) start))))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1652 ((integerp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1653 ;; (BEGIN . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1654 (not (or (< (car undo-elt) end) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1655 (> (cdr undo-elt) start)))))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1656 |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1657 ;; 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
|
1658 ;; 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
|
1659 ;; the undo. |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1660 (defun undo-delta (undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1661 (if (consp undo-elt) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1662 (cond ((stringp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1663 ;; (TEXT . POSITION) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1664 (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
|
1665 ((integerp (car undo-elt)) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1666 ;; (BEGIN . END) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1667 (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
|
1668 (t |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1669 '(0 . 0))) |
e260c4389363
Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents:
21122
diff
changeset
|
1670 '(0 . 0))) |
59055
f6e8a2dc456a
(undo-outer-limit-truncate): New function.
Richard M. Stallman <rms@gnu.org>
parents:
58961
diff
changeset
|
1671 |
59790
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1672 (defcustom undo-ask-before-discard t |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1673 "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
|
1674 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
|
1675 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
|
1676 non-nil, it asks in the echo area whether to discard the info. |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1677 If you answer no, there a slight risk that Emacs might crash, so |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1678 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
|
1679 |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1680 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
|
1681 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
|
1682 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
|
1683 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
|
1684 excessively long before answering the question." |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1685 :type 'boolean |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1686 :group 'undo |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59790
diff
changeset
|
1687 :version "22.1") |
59790
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1688 |
59178
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
1689 (defvar undo-extra-outer-limit nil |
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
1690 "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
|
1691 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
|
1692 current item gets bigger than this amount. |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1693 |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1694 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
|
1695 (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
|
1696 |
59790
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1697 ;; 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
|
1698 ;; 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
|
1699 ;; 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
|
1700 ;; 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
|
1701 ;; lot of consing. |
59055
f6e8a2dc456a
(undo-outer-limit-truncate): New function.
Richard M. Stallman <rms@gnu.org>
parents:
58961
diff
changeset
|
1702 (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
|
1703 (defun undo-outer-limit-truncate (size) |
59790
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1704 (if undo-ask-before-discard |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1705 (when (or (null undo-extra-outer-limit) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1706 (> size undo-extra-outer-limit)) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1707 ;; 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
|
1708 ;; 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
|
1709 ;; 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
|
1710 ;; again momentarily. It will call this function again, |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1711 ;; 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
|
1712 (setq undo-extra-outer-limit (+ size 50000)) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1713 (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
|
1714 (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
|
1715 (buffer-name) size))) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1716 (progn (setq buffer-undo-list nil) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1717 (setq undo-extra-outer-limit nil) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1718 t) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1719 nil)) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1720 (display-warning '(undo discard-info) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1721 (concat |
70325
c8e4a9156d18
(undo-outer-limit-truncate): Put quotes around buffer name in messages.
Richard M. Stallman <rms@gnu.org>
parents:
69899
diff
changeset
|
1722 (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
|
1723 (buffer-name) size) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1724 "The undo info was discarded because it exceeded \ |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1725 `undo-outer-limit'. |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1726 |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1727 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
|
1728 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
|
1729 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
|
1730 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
|
1731 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
|
1732 maximum memory allotted to Emacs. |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1733 |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1734 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
|
1735 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
|
1736 |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1737 You can disable the popping up of this buffer by adding the entry |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1738 \(undo discard-info) to the user option `warning-suppress-types'.\n") |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1739 :warning) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1740 (setq buffer-undo-list nil) |
85fb49e8bc60
(undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents:
59782
diff
changeset
|
1741 t)) |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
1742 |
4374
1a64d641cea4
(shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4289
diff
changeset
|
1743 (defvar shell-command-history nil |
1a64d641cea4
(shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4289
diff
changeset
|
1744 "History list for some commands that read shell commands.") |
1a64d641cea4
(shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
4289
diff
changeset
|
1745 |
9779
1286985b5a26
(shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9771
diff
changeset
|
1746 (defvar shell-command-switch "-c" |
1286985b5a26
(shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9771
diff
changeset
|
1747 "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
|
1748 |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1749 (defvar shell-command-default-error-buffer nil |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1750 "*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
|
1751 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
|
1752 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
|
1753 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
|
1754 |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1755 (defun shell-command (command &optional output-buffer error-buffer) |
475 | 1756 "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
|
1757 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
|
1758 |
475 | 1759 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
|
1760 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
|
1761 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
|
1762 |
33312
1e1d6d077288
(shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents:
32899
diff
changeset
|
1763 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
|
1764 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
|
1765 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
|
1766 `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
|
1767 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
|
1768 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
|
1769 |
19109
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
1770 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
|
1771 in the shell command output, use \\[universal-coding-system-argument] |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
1772 before this command. |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
1773 |
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
1774 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
|
1775 `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
|
1776 |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
1777 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
|
1778 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
|
1779 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
|
1780 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
|
1781 insert output in current buffer. (This cannot be done asynchronously.) |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1782 In either case, the output is inserted after point (leaving mark after it). |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1783 |
41996
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1784 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
|
1785 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
|
1786 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
|
1787 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
|
1788 \(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
|
1789 `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
|
1790 the buffer containing the output is displayed. |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1791 |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1792 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
|
1793 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
|
1794 of the output. |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1795 |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1796 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
|
1797 then `*Shell Command Output*' is deleted. |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1798 |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1799 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
|
1800 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
|
1801 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
|
1802 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
|
1803 specifies the value of ERROR-BUFFER." |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1804 |
4488
b0a70d8d9af4
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
4477
diff
changeset
|
1805 (interactive (list (read-from-minibuffer "Shell command: " |
b0a70d8d9af4
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
4477
diff
changeset
|
1806 nil nil nil 'shell-command-history) |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1807 current-prefix-arg |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1808 shell-command-default-error-buffer)) |
14627
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1809 ;; 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
|
1810 (let ((handler |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1811 (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
|
1812 'shell-command))) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1813 (if handler |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1814 (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
|
1815 (if (and output-buffer |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1816 (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
|
1817 ;; Output goes in current buffer. |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1818 (let ((error-file |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1819 (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
|
1820 (make-temp-file |
25483
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
1821 (expand-file-name "scor" |
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
1822 (or small-temporary-file-directory |
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
1823 temporary-file-directory))) |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1824 nil))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1825 (barf-if-buffer-read-only) |
24825
f88179cfae99
(shell-command): Avoid printing "mark set" message.
Karl Heuer <kwzh@gnu.org>
parents:
24814
diff
changeset
|
1826 (push-mark nil t) |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1827 ;; 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
|
1828 ;; .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
|
1829 ;; "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
|
1830 ;; 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
|
1831 ;; 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
|
1832 (call-process shell-file-name nil |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1833 (if error-file |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1834 (list t error-file) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1835 t) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1836 nil shell-command-switch command) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1837 (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
|
1838 (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
|
1839 (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
|
1840 (let ((pos-from-end (- (point-max) (point)))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1841 (or (bobp) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1842 (insert "\f\n")) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1843 ;; Do no formatting while reading error file, |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1844 ;; 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
|
1845 ;; 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
|
1846 (format-insert-file error-file nil) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1847 ;; Put point after the inserted errors. |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1848 (goto-char (- (point-max) pos-from-end))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1849 (display-buffer (current-buffer)))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1850 (delete-file error-file)) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1851 ;; 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
|
1852 ;; 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
|
1853 ;; 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
|
1854 ;; because we inserted text. |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1855 (goto-char (prog1 (mark t) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1856 (set-marker (mark-marker) (point) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1857 (current-buffer))))) |
41996
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1858 ;; Output goes in a separate buffer. |
14627
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1859 ;; 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
|
1860 (save-match-data |
46026
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
1861 (if (string-match "[ \t]*&[ \t]*\\'" command) |
14627
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1862 ;; Command ending with ampersand means asynchronous. |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1863 (let ((buffer (get-buffer-create |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1864 (or output-buffer "*Async Shell Command*"))) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1865 (directory default-directory) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1866 proc) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1867 ;; Remove the ampersand. |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1868 (setq command (substring command 0 (match-beginning 0))) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1869 ;; If will kill a process, query first. |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1870 (setq proc (get-buffer-process buffer)) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1871 (if proc |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1872 (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
|
1873 (kill-process proc) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1874 (error "Shell command in progress"))) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
1875 (with-current-buffer buffer |
14627
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1876 (setq buffer-read-only nil) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1877 (erase-buffer) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1878 (display-buffer buffer) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1879 (setq default-directory directory) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1880 (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
|
1881 shell-command-switch command)) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1882 (setq mode-line-process '(":%s")) |
51026
8113316012c6
(shell-command): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50987
diff
changeset
|
1883 (require 'shell) (shell-mode) |
14627
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1884 (set-process-sentinel proc 'shell-command-sentinel) |
670173a3653b
(shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents:
14507
diff
changeset
|
1885 )) |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1886 (shell-command-on-region (point) (point) command |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
1887 output-buffer nil error-buffer))))))) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
1888 |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1889 (defun display-message-or-buffer (message |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1890 &optional buffer-name not-this-window frame) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1891 "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
|
1892 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
|
1893 |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1894 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
|
1895 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
|
1896 if `resize-mini-windows' is non-nil. |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1897 |
32260 | 1898 Returns either the string shown in the echo area, or when a pop-up |
1899 buffer is used, the window used to display it. | |
1900 | |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1901 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
|
1902 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
|
1903 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
|
1904 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
|
1905 the contents are inserted into the buffer anyway. |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1906 |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1907 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
|
1908 and only used if a buffer is displayed." |
68613
1c23b04a7a2c
(display-message-or-buffer): Compare the number of characters to the frame
Eli Zaretskii <eliz@gnu.org>
parents:
68611
diff
changeset
|
1909 (cond ((and (stringp message) |
1c23b04a7a2c
(display-message-or-buffer): Compare the number of characters to the frame
Eli Zaretskii <eliz@gnu.org>
parents:
68611
diff
changeset
|
1910 (not (string-match "\n" message)) |
1c23b04a7a2c
(display-message-or-buffer): Compare the number of characters to the frame
Eli Zaretskii <eliz@gnu.org>
parents:
68611
diff
changeset
|
1911 (<= (length message) (frame-width))) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1912 ;; 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
|
1913 (message "%s" message)) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1914 ((and (stringp message) |
68613
1c23b04a7a2c
(display-message-or-buffer): Compare the number of characters to the frame
Eli Zaretskii <eliz@gnu.org>
parents:
68611
diff
changeset
|
1915 (= (string-match "\n" message) (1- (length message))) |
1c23b04a7a2c
(display-message-or-buffer): Compare the number of characters to the frame
Eli Zaretskii <eliz@gnu.org>
parents:
68611
diff
changeset
|
1916 (<= (1- (length message)) (frame-width))) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1917 ;; 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
|
1918 (message "%s" (substring message 0 (1- (length message))))) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1919 (t |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1920 ;; General case |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1921 (with-current-buffer |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1922 (if (bufferp message) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1923 message |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1924 (get-buffer-create (or buffer-name "*Message*"))) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1925 |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1926 (unless (bufferp message) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1927 (erase-buffer) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1928 (insert message)) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1929 |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1930 (let ((lines |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1931 (if (= (buffer-size) 0) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1932 0 |
68611
28a6ea706763
(display-message-or-buffer): Count screen lines instead of buffer lines when
Eli Zaretskii <eliz@gnu.org>
parents:
68537
diff
changeset
|
1933 (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
|
1934 (cond ((= lines 0)) |
d3416b0f856c
(toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents:
47599
diff
changeset
|
1935 ((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
|
1936 (<= lines |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
1937 (if resize-mini-windows |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
1938 (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
|
1939 (* (frame-height) |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
1940 max-mini-window-height)) |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
1941 ((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
|
1942 max-mini-window-height) |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
1943 (t |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
1944 1)) |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
1945 1))) |
312f417a8513
(shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents:
45870
diff
changeset
|
1946 ;; 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
|
1947 ;; already dispayed in the selected frame. |
46090
f52b57f5e2a4
(display-message-or-buffer): Fix last change.
Andreas Schwab <schwab@suse.de>
parents:
46088
diff
changeset
|
1948 (not (get-buffer-window (current-buffer)))) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1949 ;; Echo area |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1950 (goto-char (point-max)) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1951 (when (bolp) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1952 (backward-char 1)) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1953 (message "%s" (buffer-substring (point-min) (point)))) |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1954 (t |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1955 ;; Buffer |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1956 (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
|
1957 (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
|
1958 not-this-window frame)))))))) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1959 |
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
1960 |
475 | 1961 ;; We have a sentinel to prevent insertion of a termination message |
1962 ;; in the buffer itself. | |
1963 (defun shell-command-sentinel (process signal) | |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
1964 (if (memq (process-status process) '(exit signal)) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
1965 (message "%s: %s." |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
1966 (car (cdr (cdr (process-command process)))) |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
1967 (substring signal 0 -1)))) |
475 | 1968 |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
1969 (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
|
1970 &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
|
1971 error-buffer display-error-buffer) |
475 | 1972 "Execute string COMMAND in inferior shell with region as input. |
1973 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
|
1974 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
|
1975 COMMAND. |
10852
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
1976 |
19109
98515e50136d
(shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
19003
diff
changeset
|
1977 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
|
1978 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
|
1979 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
|
1980 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
|
1981 `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
|
1982 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
|
1983 |
56761
486136b7f89c
(shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents:
56613
diff
changeset
|
1984 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
|
1985 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
|
1986 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
|
1987 `coding-system-for-read' and `coding-system-for-write'. |
475 | 1988 |
41996
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1989 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
|
1990 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
|
1991 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
|
1992 \(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
|
1993 `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
|
1994 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
|
1995 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
|
1996 |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
1997 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
|
1998 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
|
1999 |
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
2000 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
|
2001 then `*Shell Command Output*' is deleted. |
9539
164a7cb8d0ea
(shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents:
9434
diff
changeset
|
2002 |
10852
55552df3bd18
(shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
10813
diff
changeset
|
2003 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
|
2004 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
|
2005 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
|
2006 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
|
2007 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
|
2008 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
|
2009 |
23471
b6dbbd2cc3ac
(shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23450
diff
changeset
|
2010 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
|
2011 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
|
2012 around it. |
b6dbbd2cc3ac
(shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23450
diff
changeset
|
2013 |
23588
cec6b3f8f355
(shell-command-on-region): Doc fix.
Andreas Schwab <schwab@suse.de>
parents:
23520
diff
changeset
|
2014 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
|
2015 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
|
2016 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
|
2017 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
|
2018 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
|
2019 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
|
2020 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
|
2021 (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
|
2022 (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
|
2023 (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
|
2024 ;; 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
|
2025 ;; 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
|
2026 ;; relocates them while we are in the minibuffer. |
27a9a1ef61f9
(shell-command-on-region): Err if no mark before reading the command string.
Richard M. Stallman <rms@gnu.org>
parents:
42691
diff
changeset
|
2027 (setq string (read-from-minibuffer "Shell command on region: " |
27a9a1ef61f9
(shell-command-on-region): Err if no mark before reading the command string.
Richard M. Stallman <rms@gnu.org>
parents:
42691
diff
changeset
|
2028 nil nil nil |
27a9a1ef61f9
(shell-command-on-region): Err if no mark before reading the command string.
Richard M. Stallman <rms@gnu.org>
parents:
42691
diff
changeset
|
2029 'shell-command-history)) |
13482
e49cd471ced7
(do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13328
diff
changeset
|
2030 ;; call-interactively recognizes region-beginning and |
e49cd471ced7
(do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents:
13328
diff
changeset
|
2031 ;; 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
|
2032 (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
|
2033 string |
7b7874738e7c
(shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents:
10779
diff
changeset
|
2034 current-prefix-arg |
24106
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2035 current-prefix-arg |
56761
486136b7f89c
(shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents:
56613
diff
changeset
|
2036 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
|
2037 t))) |
19362
fddeff2c6697
(shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents:
19343
diff
changeset
|
2038 (let ((error-file |
25483
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
2039 (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
|
2040 (make-temp-file |
25483
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
2041 (expand-file-name "scor" |
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
2042 (or small-temporary-file-directory |
cd1649a27c08
(shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents:
25400
diff
changeset
|
2043 temporary-file-directory))) |
24155
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2044 nil)) |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2045 exit-status) |
24106
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2046 (if (or replace |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2047 (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
|
2048 (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
|
2049 ;; 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
|
2050 (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
|
2051 ;; 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
|
2052 (goto-char start) |
43794
8acd1399d389
(shell-command-on-region): Call push-mark with
Eli Zaretskii <eliz@gnu.org>
parents:
43581
diff
changeset
|
2053 (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
|
2054 (setq exit-status |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2055 (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
|
2056 (if error-file |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2057 (list t error-file) |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2058 t) |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2059 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
|
2060 ;; 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
|
2061 ;; (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
|
2062 ;; (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
|
2063 ;; (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
|
2064 ;; 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
|
2065 (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
|
2066 ;; 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
|
2067 ;; replacing its entire contents. |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2068 (let ((buffer (get-buffer-create |
46088
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2069 (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
|
2070 (unwind-protect |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2071 (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
|
2072 ;; 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
|
2073 ;; 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
|
2074 ;; 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
|
2075 (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
|
2076 (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
|
2077 (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
|
2078 (setq exit-status |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2079 (call-process-region (point-min) (point-max) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2080 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
|
2081 (if error-file |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2082 (list t error-file) |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2083 t) |
24155
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2084 nil shell-command-switch |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2085 command))) |
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2086 ;; 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
|
2087 ;; output there. |
28703
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
2088 (let ((directory default-directory)) |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
2089 (save-excursion |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
2090 (set-buffer buffer) |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
2091 (setq buffer-read-only nil) |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
2092 (if (not output-buffer) |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
2093 (setq default-directory directory)) |
8cc58b0b674d
(shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents:
28661
diff
changeset
|
2094 (erase-buffer))) |
24106
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2095 (setq exit-status |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2096 (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
|
2097 (if error-file |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2098 (list buffer error-file) |
ea58bb66d0e3
(shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents:
24078
diff
changeset
|
2099 buffer) |
24155
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2100 nil shell-command-switch command))) |
41996
bdcb303c6aeb
(undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents:
41924
diff
changeset
|
2101 ;; Report the output. |
43581
d7536b0977ac
(shell-command-on-region): Report non-zero exit
Kim F. Storm <storm@cua.dk>
parents:
43436
diff
changeset
|
2102 (with-current-buffer buffer |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49585
diff
changeset
|
2103 (setq mode-line-process |
46088
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2104 (cond ((null exit-status) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2105 " - Error") |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2106 ((stringp exit-status) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2107 (format " - Signal [%s]" exit-status)) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2108 ((not (equal 0 exit-status)) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2109 (format " - Exit [%d]" exit-status))))) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2110 (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
|
2111 ;; 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
|
2112 (display-message-or-buffer buffer) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2113 ;; 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
|
2114 (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
|
2115 (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
|
2116 (< 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
|
2117 "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
|
2118 "no output"))) |
46088
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2119 (cond ((null exit-status) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2120 (message "(Shell command failed with error)")) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2121 ((equal 0 exit-status) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2122 (message "(Shell command succeeded with %s)" |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2123 output)) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2124 ((stringp exit-status) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2125 (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
|
2126 exit-status)) |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2127 (t |
9d9568a15aa3
(shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents:
46026
diff
changeset
|
2128 (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
|
2129 exit-status output)))) |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2130 ;; 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
|
2131 ;; (kill-buffer buffer) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
2132 )))) |
32203
f10445ddce32
(display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents:
32201
diff
changeset
|
2133 |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2134 (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
|
2135 (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
|
2136 (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
|
2137 (let ((pos-from-end (- (point-max) (point)))) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2138 (or (bobp) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2139 (insert "\f\n")) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2140 ;; Do no formatting while reading error file, |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2141 ;; 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
|
2142 ;; 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
|
2143 (format-insert-file error-file nil) |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2144 ;; Put point after the inserted errors. |
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2145 (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
|
2146 (and display-error-buffer |
486136b7f89c
(shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents:
56613
diff
changeset
|
2147 (display-buffer (current-buffer))))) |
24419
30e478cd167e
(shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents:
24400
diff
changeset
|
2148 (delete-file error-file)) |
24155
62548105541c
(shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents:
24106
diff
changeset
|
2149 exit-status)) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2150 |
16312
20690a1ec100
(shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16018
diff
changeset
|
2151 (defun shell-command-to-string (command) |
20690a1ec100
(shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents:
16018
diff
changeset
|
2152 "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
|
2153 (with-output-to-string |
16316
50be5f6cb5e6
(shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents:
16312
diff
changeset
|
2154 (with-current-buffer |
50be5f6cb5e6
(shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents:
16312
diff
changeset
|
2155 standard-output |
50be5f6cb5e6
(shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents:
16312
diff
changeset
|
2156 (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
|
2157 |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2158 (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
|
2159 "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
|
2160 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
|
2161 `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
|
2162 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
|
2163 |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2164 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
|
2165 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
|
2166 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
|
2167 `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
|
2168 and BUFFER.\) |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2169 |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2170 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
|
2171 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
|
2172 value passed." |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2173 (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
|
2174 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
|
2175 (unwind-protect |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2176 (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
|
2177 (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
|
2178 (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
|
2179 (make-temp-file "emacs"))) |
4d4bfb9781e1
(process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57668
diff
changeset
|
2180 (prog1 |
4d4bfb9781e1
(process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57668
diff
changeset
|
2181 (apply 'call-process program |
4d4bfb9781e1
(process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57668
diff
changeset
|
2182 (or lc infile) |
4d4bfb9781e1
(process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57668
diff
changeset
|
2183 (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
|
2184 display args) |
4d4bfb9781e1
(process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57668
diff
changeset
|
2185 (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
|
2186 (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
|
2187 (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
|
2188 |
b324ca4df07c
* simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
57146
diff
changeset
|
2189 |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
2190 |
16685
26919ad3a4ad
Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents:
16632
diff
changeset
|
2191 (defvar universal-argument-map |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2192 (let ((map (make-sparse-keymap))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2193 (define-key map [t] 'universal-argument-other-key) |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
2194 (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
|
2195 (define-key map [switch-frame] nil) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2196 (define-key map [?\C-u] 'universal-argument-more) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2197 (define-key map [?-] 'universal-argument-minus) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2198 (define-key map [?0] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2199 (define-key map [?1] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2200 (define-key map [?2] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2201 (define-key map [?3] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2202 (define-key map [?4] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2203 (define-key map [?5] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2204 (define-key map [?6] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2205 (define-key map [?7] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2206 (define-key map [?8] 'digit-argument) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2207 (define-key map [?9] 'digit-argument) |
30347
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2208 (define-key map [kp-0] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2209 (define-key map [kp-1] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2210 (define-key map [kp-2] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2211 (define-key map [kp-3] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2212 (define-key map [kp-4] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2213 (define-key map [kp-5] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2214 (define-key map [kp-6] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2215 (define-key map [kp-7] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2216 (define-key map [kp-8] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2217 (define-key map [kp-9] 'digit-argument) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2218 (define-key map [kp-subtract] 'universal-argument-minus) |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2219 map) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2220 "Keymap used while processing \\[universal-argument].") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2221 |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2222 (defvar universal-argument-num-events nil |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2223 "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
|
2224 `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
|
2225 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
|
2226 |
52966
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2227 (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
|
2228 "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
|
2229 |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2230 (defvar saved-overriding-map nil |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2231 "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
|
2232 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
|
2233 argument mode\".") |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2234 |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2235 (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
|
2236 "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
|
2237 (unless overriding-map-is-bound |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2238 (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
|
2239 (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
|
2240 (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
|
2241 |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2242 (defun restore-overriding-map () |
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2243 "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
|
2244 (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
|
2245 (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
|
2246 |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
2247 (defun universal-argument () |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
2248 "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
|
2249 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
|
2250 \\[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
|
2251 \\[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
|
2252 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
|
2253 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
|
2254 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
|
2255 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
|
2256 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
|
2257 (interactive) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2258 (setq prefix-arg (list 4)) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2259 (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
|
2260 (ensure-overriding-map-is-bound)) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
2261 |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2262 ;; 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
|
2263 ;; 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
|
2264 (defun universal-argument-more (arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2265 (interactive "P") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2266 (if (consp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2267 (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
|
2268 (if (eq arg '-) |
15e868121a15
(newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents:
17133
diff
changeset
|
2269 (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
|
2270 (setq prefix-arg arg) |
52966
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2271 (restore-overriding-map))) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2272 (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
|
2273 |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2274 (defun negative-argument (arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2275 "Begin a negative numeric argument for the next command. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2276 \\[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
|
2277 (interactive "P") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2278 (cond ((integerp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2279 (setq prefix-arg (- arg))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2280 ((eq arg '-) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2281 (setq prefix-arg nil)) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2282 (t |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
2283 (setq prefix-arg '-))) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2284 (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
|
2285 (ensure-overriding-map-is-bound)) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
2286 |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
2287 (defun digit-argument (arg) |
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
2288 "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
|
2289 \\[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
|
2290 (interactive "P") |
30347
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2291 (let* ((char (if (integerp last-command-char) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2292 last-command-char |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2293 (get last-command-char 'ascii-character))) |
a8a6780670ad
(universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents:
30189
diff
changeset
|
2294 (digit (- (logand char ?\177) ?0))) |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2295 (cond ((integerp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2296 (setq prefix-arg (+ (* arg 10) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2297 (if (< arg 0) (- digit) digit)))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2298 ((eq arg '-) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2299 ;; Treat -0 as just -, so that -01 will work. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2300 (setq prefix-arg (if (zerop digit) '- (- digit)))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2301 (t |
12313
eca218b0a8ca
(negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents:
12266
diff
changeset
|
2302 (setq prefix-arg digit)))) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2303 (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
|
2304 (ensure-overriding-map-is-bound)) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
2305 |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2306 ;; 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
|
2307 ;; command if digits have already been entered. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2308 (defun universal-argument-minus (arg) |
12230
7275b8e0d272
(universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents:
11975
diff
changeset
|
2309 (interactive "P") |
12266
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2310 (if (integerp arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2311 (universal-argument-other-key arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2312 (negative-argument arg))) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2313 |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2314 ;; 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
|
2315 ;; executed as a command. |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2316 (defun universal-argument-other-key (arg) |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2317 (interactive "P") |
bdc0826013e0
(universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents:
12230
diff
changeset
|
2318 (setq prefix-arg arg) |
12334
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2319 (let* ((key (this-command-keys)) |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2320 (keylist (listify-key-sequence key))) |
326cccb5f51a
(universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
12320
diff
changeset
|
2321 (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
|
2322 (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
|
2323 unread-command-events))) |
12320
979836b1a1a9
(universal-argument-other-key): Call reset-this-command-lengths.
Richard M. Stallman <rms@gnu.org>
parents:
12313
diff
changeset
|
2324 (reset-this-command-lengths) |
52966
6fc70221e5c7
(overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents:
52944
diff
changeset
|
2325 (restore-overriding-map)) |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
2326 |
61111
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2327 (defvar buffer-substring-filters nil |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2328 "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
|
2329 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
|
2330 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
|
2331 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
|
2332 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
|
2333 return value of `filter-buffer-substring'. |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2334 |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2335 If this variable is nil, no filtering is performed.") |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2336 |
69899
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2337 (defun filter-buffer-substring (beg end &optional delete noprops) |
61111
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2338 "Return the buffer substring between BEG and END, after filtering. |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2339 The buffer substring is passed through each of the filter |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2340 functions in `buffer-substring-filters', and the value from the |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2341 last filter function is returned. If `buffer-substring-filters' |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2342 is nil, the buffer substring is returned unaltered. |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2343 |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2344 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
|
2345 from the buffer. |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2346 |
69899
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2347 If NOPROPS is non-nil, final string returned does not include |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2348 text properties, while the string passed to the filters still |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2349 includes text properties from the buffer text. |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2350 |
62919
038ca3b7ba0d
(filter-buffer-substring): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
62739
diff
changeset
|
2351 Point is temporarily set to BEG before calling |
61111
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2352 `buffer-substring-filters', in case the functions need to know |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2353 where the text came from. |
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2354 |
69899
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2355 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
|
2356 `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
|
2357 when you want to allow filtering to take place. For example, |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2358 major or minor modes can use `buffer-substring-filters' to |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2359 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
|
2360 be copied into other buffers." |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2361 (cond |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2362 ((or delete buffer-substring-filters) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2363 (save-excursion |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2364 (goto-char beg) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2365 (let ((string (if delete (delete-and-extract-region beg end) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2366 (buffer-substring beg end)))) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2367 (dolist (filter buffer-substring-filters) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2368 (setq string (funcall filter string))) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2369 (if noprops |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2370 (set-text-properties 0 (length string) nil string)) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2371 string))) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2372 (noprops |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2373 (buffer-substring-no-properties beg end)) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2374 (t |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2375 (buffer-substring beg end)))) |
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
2376 |
61111
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2377 |
715 | 2378 ;;;; Window system cut and paste hooks. |
2379 | |
2380 (defvar interprogram-cut-function nil | |
2381 "Function to call to make a killed region available to other programs. | |
2382 | |
2383 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
|
2384 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
|
2385 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
|
2386 is put in the kill ring, to make the new kill available to other |
715 | 2387 programs. |
2388 | |
3034
dd65780e6246
(kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents:
3029
diff
changeset
|
2389 The function takes one or two arguments. |
dd65780e6246
(kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents:
3029
diff
changeset
|
2390 The first argument, TEXT, is a string containing |
dd65780e6246
(kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents:
3029
diff
changeset
|
2391 the text which should be made available. |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2392 The second, optional, argument PUSH, has the same meaning as the |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2393 similar argument to `x-set-cut-buffer', which see.") |
715 | 2394 |
2395 (defvar interprogram-paste-function nil | |
2396 "Function to call to get text cut from other programs. | |
2397 | |
2398 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
|
2399 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
|
2400 This variable holds a function that Emacs calls to obtain |
715 | 2401 text that other programs have provided for pasting. |
2402 | |
2403 The function should be called with no arguments. If the function | |
2404 returns nil, then no other program has provided such text, and the top | |
2405 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
|
2406 string, then the caller of the function \(usually `current-kill') |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2407 should put this string in the kill ring as the latest kill. |
727 | 2408 |
2409 Note that the function should return a string only if a program other | |
2410 than Emacs has provided a string for pasting; if Emacs provided the | |
2411 most recent string, the function should return nil. If it is | |
2412 difficult to tell whether Emacs or some other program provided the | |
2413 current string, it is probably good enough to return nil if the string | |
2414 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
|
2415 |
715 | 2416 |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
2417 |
715 | 2418 ;;;; The kill ring data structure. |
475 | 2419 |
2420 (defvar kill-ring nil | |
715 | 2421 "List of killed text sequences. |
2422 Since the kill ring is supposed to interact nicely with cut-and-paste | |
2423 facilities offered by window systems, use of this variable should | |
2424 interact nicely with `interprogram-cut-function' and | |
2425 `interprogram-paste-function'. The functions `kill-new', | |
2426 `kill-append', and `current-kill' are supposed to implement this | |
2427 interaction; you may want to use them instead of manipulating the kill | |
2428 ring directly.") | |
475 | 2429 |
23495
d5f08ad9a40b
(kill-ring-max): Increased to 60.
Richard M. Stallman <rms@gnu.org>
parents:
23491
diff
changeset
|
2430 (defcustom kill-ring-max 60 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2431 "*Maximum length of kill ring before oldest elements are thrown away." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2432 :type 'integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2433 :group 'killing) |
475 | 2434 |
2435 (defvar kill-ring-yank-pointer nil | |
2436 "The tail of the kill ring whose car is the last thing yanked.") | |
2437 | |
49309
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2438 (defun kill-new (string &optional replace yank-handler) |
715 | 2439 "Make STRING the latest kill in the kill ring. |
44273 | 2440 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
|
2441 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
|
2442 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
|
2443 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
|
2444 |
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2445 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
|
2446 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
|
2447 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
|
2448 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
|
2449 |
c52c622747ca
(kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49364
diff
changeset
|
2450 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
|
2451 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
|
2452 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
|
2453 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
|
2454 (if (> (length string) 0) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49585
diff
changeset
|
2455 (if yank-handler |
53931
bfe6c29e5283
(kill-new): Put yank-handler property on the entire string.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53925
diff
changeset
|
2456 (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
|
2457 '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
|
2458 (if yank-handler |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49585
diff
changeset
|
2459 (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
|
2460 (list string "yank-handler specified for empty string")))) |
c52c622747ca
(kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49364
diff
changeset
|
2461 (if (fboundp 'menu-bar-update-yank-menu) |
c52c622747ca
(kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49364
diff
changeset
|
2462 (menu-bar-update-yank-menu string (and replace (car kill-ring)))) |
34443
599c8d8e833a
(kill-new): Don't try to setcar kill-ring if it is
Gerd Moellmann <gerd@gnu.org>
parents:
34141
diff
changeset
|
2463 (if (and replace kill-ring) |
8763
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
2464 (setcar kill-ring string) |
66595
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
2465 (push string kill-ring) |
8763
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
2466 (if (> (length kill-ring) kill-ring-max) |
2b54e6deed2f
(kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents:
8734
diff
changeset
|
2467 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil))) |
715 | 2468 (setq kill-ring-yank-pointer kill-ring) |
2469 (if interprogram-cut-function | |
12975
9bad6a54e268
(kill-new): Compute 2nd arg to interprogram-cut-function based on REPLACE.
Richard M. Stallman <rms@gnu.org>
parents:
12939
diff
changeset
|
2470 (funcall interprogram-cut-function string (not replace)))) |
715 | 2471 |
49309
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2472 (defun kill-append (string before-p &optional yank-handler) |
715 | 2473 "Append STRING to the end of the latest kill in the kill ring. |
2474 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
|
2475 Optional third argument YANK-HANDLER, if non-nil, specifies the |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2476 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
|
2477 string. If the specified yank-handler arg differs from the |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2478 yank-handler property of the latest kill string, this function |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2479 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
|
2480 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
|
2481 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
|
2482 (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
|
2483 (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
|
2484 (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
|
2485 (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
|
2486 yank-handler))) |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2487 |
715 | 2488 (defun current-kill (n &optional do-not-move) |
2489 "Rotate the yanking point by N places, and then return that kill. | |
2490 If N is zero, `interprogram-paste-function' is set, and calling it | |
2491 returns a string, then that string is added to the front of the | |
2492 kill ring and returned as the latest kill. | |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2493 If optional arg DO-NOT-MOVE is non-nil, then don't actually move the |
715 | 2494 yanking point; just return the Nth kill forward." |
2495 (let ((interprogram-paste (and (= n 0) | |
2496 interprogram-paste-function | |
2497 (funcall interprogram-paste-function)))) | |
2498 (if interprogram-paste | |
2499 (progn | |
2500 ;; Disable the interprogram cut function when we add the new | |
2501 ;; text to the kill ring, so Emacs doesn't try to own the | |
2502 ;; selection, with identical text. | |
2503 (let ((interprogram-cut-function nil)) | |
2504 (kill-new interprogram-paste)) | |
2505 interprogram-paste) | |
2506 (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
|
2507 (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
|
2508 (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
|
2509 (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
|
2510 kill-ring))) |
715 | 2511 (or do-not-move |
2512 (setq kill-ring-yank-pointer ARGth-kill-element)) | |
2513 (car ARGth-kill-element))))) | |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2514 |
715 | 2515 |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
2516 |
715 | 2517 ;;;; Commands for manipulating the kill ring. |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
2518 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2519 (defcustom kill-read-only-ok nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2520 "*Non-nil means don't signal an error for killing read-only text." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2521 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
2522 :group 'killing) |
7063
9a0d189fd877
(kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents:
6951
diff
changeset
|
2523 |
14507
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
2524 (put 'text-read-only 'error-conditions |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
2525 '(text-read-only buffer-read-only error)) |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
2526 (put 'text-read-only 'error-message "Text is read-only") |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
2527 |
49309
c033d9bff1cc
(kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents:
49227
diff
changeset
|
2528 (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
|
2529 "Kill (\"cut\") text between point and mark. |
743351204cc6
(kill-region, yank): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68829
diff
changeset
|
2530 This deletes the text from the buffer and saves it in the kill ring. |
475 | 2531 The command \\[yank] can retrieve it from there. |
36110
116beb1b2fc7
(kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
36030
diff
changeset
|
2532 \(If you want to kill and then yank immediately, use \\[kill-ring-save].) |
116beb1b2fc7
(kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
36030
diff
changeset
|
2533 |
116beb1b2fc7
(kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
36030
diff
changeset
|
2534 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
|
2535 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
|
2536 |
1834
9a1f696c1734
* simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents:
1826
diff
changeset
|
2537 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
|
2538 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
|
2539 you can use the killing commands to copy text from a read-only buffer. |
475 | 2540 |
2541 This is the primitive for programs to kill text (as opposed to deleting it). | |
55975
594a6cacebfe
(kill-region): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
55799
diff
changeset
|
2542 Supply two arguments, character positions indicating the stretch of text |
475 | 2543 to be killed. |
2544 Any command that calls this function is a \"kill command\". | |
2545 If the previous command was also a kill command, | |
2546 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
|
2547 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
|
2548 |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2549 In Lisp code, optional third arg YANK-HANDLER, if non-nil, |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2550 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
|
2551 text. See `insert-for-yank'." |
27836
132294fa754e
(zap-to-char, kill-line, kill-region, kill-word)
Dave Love <fx@gnu.org>
parents:
27477
diff
changeset
|
2552 (interactive "r") |
20279
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
2553 (condition-case nil |
61111
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2554 (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
|
2555 (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
|
2556 ;; 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
|
2557 (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
|
2558 (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
|
2559 (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
|
2560 (when (or string (eq last-command 'kill-region)) |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2561 (setq this-command 'kill-region)) |
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2562 nil) |
20279
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
2563 ((buffer-read-only text-read-only) |
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
2564 ;; 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
|
2565 ;; in the region, are read-only. |
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
2566 ;; 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
|
2567 ;; However, there's no harm in putting |
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
2568 ;; 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
|
2569 (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
|
2570 ;; 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
|
2571 (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
|
2572 ;; 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
|
2573 (if kill-read-only-ok |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2574 (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
|
2575 ;; 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
|
2576 (barf-if-buffer-read-only) |
69a6030e443a
(kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents:
20265
diff
changeset
|
2577 ;; 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
|
2578 (signal 'text-read-only (list (current-buffer))))))) |
475 | 2579 |
9876
75ecf866cfb8
Comment reason for preceding change.
Karl Heuer <kwzh@gnu.org>
parents:
9870
diff
changeset
|
2580 ;; 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
|
2581 ;; 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
|
2582 ;; then corrects it with the intended C-w. |
475 | 2583 (defun copy-region-as-kill (beg end) |
2584 "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
|
2585 In Transient Mark mode, deactivate the mark. |
617 | 2586 If `interprogram-cut-function' is non-nil, also save the text for a window |
2587 system cut and paste." | |
475 | 2588 (interactive "r") |
2589 (if (eq last-command 'kill-region) | |
61111
43d165e3db5b
(idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents:
61070
diff
changeset
|
2590 (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
|
2591 (kill-new (filter-buffer-substring beg end))) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2592 (if transient-mark-mode |
21193
20bba919ec72
(copy-region-as-kill): Set deactivate-mark
Richard M. Stallman <rms@gnu.org>
parents:
21175
diff
changeset
|
2593 (setq deactivate-mark t)) |
475 | 2594 nil) |
2595 | |
2596 (defun kill-ring-save (beg end) | |
2111
d38d32084c15
* simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2075
diff
changeset
|
2597 "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
|
2598 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
|
2599 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
|
2600 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
|
2601 |
36110
116beb1b2fc7
(kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
36030
diff
changeset
|
2602 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
|
2603 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
|
2604 |
3467
002945794814
(kill-ring-save): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
3408
diff
changeset
|
2605 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
|
2606 visual feedback indicating the extent of the region being copied." |
475 | 2607 (interactive "r") |
2608 (copy-region-as-kill beg end) | |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
2609 ;; This use of interactive-p is correct |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
2610 ;; because the code it controls just gives the user visual feedback. |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
762
diff
changeset
|
2611 (if (interactive-p) |
2850
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2612 (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
|
2613 (opoint (point)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2614 ;; 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
|
2615 ;; 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
|
2616 (inhibit-quit t)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2617 (if (pos-visible-in-window-p other-end (selected-window)) |
55262
49e42dd581dd
(kill-ring-save): If region face background color is
Kim F. Storm <storm@cua.dk>
parents:
55177
diff
changeset
|
2618 (unless (and transient-mark-mode |
49e42dd581dd
(kill-ring-save): If region face background color is
Kim F. Storm <storm@cua.dk>
parents:
55177
diff
changeset
|
2619 (face-background 'region)) |
2850
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2620 ;; Swap point and mark. |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2621 (set-marker (mark-marker) (point) (current-buffer)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2622 (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
|
2623 (sit-for blink-matching-delay) |
2850
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2624 ;; Swap back. |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2625 (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
|
2626 (goto-char opoint) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2627 ;; If user quit, deactivate the mark |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2628 ;; 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
|
2629 (and quit-flag mark-active |
4287
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
2630 (deactivate-mark))) |
2850
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2631 (let* ((killed-text (current-kill 0)) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2632 (message-len (min (length killed-text) 40))) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2633 (if (= (point) beg) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2634 ;; Don't say "killed"; that is misleading. |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2635 (message "Saved text until \"%s\"" |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2636 (substring killed-text (- message-len))) |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2637 (message "Saved text from \"%s\"" |
f5f7e7295ec2
(keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents:
2844
diff
changeset
|
2638 (substring killed-text 0 message-len)))))))) |
475 | 2639 |
24798
6fe40d35360e
(append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents:
24789
diff
changeset
|
2640 (defun append-next-kill (&optional interactive) |
6fe40d35360e
(append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents:
24789
diff
changeset
|
2641 "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
|
2642 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
|
2643 (interactive "p") |
6fe40d35360e
(append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents:
24789
diff
changeset
|
2644 ;; 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
|
2645 (if interactive |
475 | 2646 (progn |
2647 (setq this-command 'kill-region) | |
2648 (message "If the next command is a kill, it will append")) | |
2649 (setq last-command 'kill-region))) | |
44667
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
2650 |
25292 | 2651 ;; Yanking. |
475 | 2652 |
44667
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
2653 ;; 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
|
2654 (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
|
2655 '(read-only invisible intangible field mouse-face help-echo local-map keymap |
61604
8c769026ef46
(yank-excluded-properties): Add follow-link to value.
Richard M. Stallman <rms@gnu.org>
parents:
61531
diff
changeset
|
2656 yank-handler follow-link) |
51461
5bcd833ec510
(yank-excluded-properties): Expand documentation string.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51324
diff
changeset
|
2657 "*Text properties to discard when yanking. |
5bcd833ec510
(yank-excluded-properties): Expand documentation string.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51324
diff
changeset
|
2658 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
|
2659 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
|
2660 :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
|
2661 :group 'killing |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59790
diff
changeset
|
2662 :version "22.1") |
44667
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
2663 |
48583
150e7a54d970
(yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
48406
diff
changeset
|
2664 (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
|
2665 (defvar yank-undo-function nil |
49364 | 2666 "If non-nil, function used by `yank-pop' to delete last stretch of yanked text. |
2667 Function is called with two parameters, START and END corresponding to | |
2668 the value of the mark and point; it is guaranteed that START <= END. | |
2669 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
|
2670 |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2671 (defun yank-pop (&optional arg) |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
2672 "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
|
2673 This command is allowed only immediately after a `yank' or a `yank-pop'. |
475 | 2674 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
|
2675 previously-killed text. `yank-pop' deletes that text and inserts in its |
475 | 2676 place a different stretch of killed text. |
2677 | |
2678 With no argument, the previous kill is inserted. | |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
2679 With argument N, insert the Nth previous kill. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
2680 If N is negative, this is a more recent kill. |
475 | 2681 |
2682 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
|
2683 comes the newest one. |
71a259bf6342
(yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents:
62179
diff
changeset
|
2684 |
71a259bf6342
(yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents:
62179
diff
changeset
|
2685 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
|
2686 `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
|
2687 doc string for `insert-for-yank-1', which see." |
475 | 2688 (interactive "*p") |
2689 (if (not (eq last-command 'yank)) | |
2690 (error "Previous command was not a yank")) | |
2691 (setq this-command 'yank) | |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2692 (unless arg (setq arg 1)) |
14507
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
2693 (let ((inhibit-read-only t) |
ec4424facc98
(text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
2694 (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
|
2695 (if before |
ebc6f47b202e
(yank-pop): Always call yank-undo-function with start <= end.
Kim F. Storm <storm@cua.dk>
parents:
49309
diff
changeset
|
2696 (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
|
2697 (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
|
2698 (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
|
2699 (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
|
2700 (insert-for-yank (current-kill arg)) |
48583
150e7a54d970
(yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
48406
diff
changeset
|
2701 ;; 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
|
2702 ;; if possible. |
150e7a54d970
(yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
48406
diff
changeset
|
2703 (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
|
2704 (if before |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
2705 ;; 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
|
2706 ;; 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
|
2707 ;; 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
|
2708 (goto-char (prog1 (mark t) |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
2709 (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
|
2710 nil) |
475 | 2711 |
2712 (defun yank (&optional arg) | |
69410
7f8930333b39
(yank): Fix typo in docstring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
69396
diff
changeset
|
2713 "Reinsert (\"paste\") the last stretch of killed text. |
475 | 2714 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
|
2715 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
|
2716 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
|
2717 With argument N, reinsert the Nth most recently killed stretch of killed |
475 | 2718 text. |
62632
71a259bf6342
(yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents:
62179
diff
changeset
|
2719 |
71a259bf6342
(yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents:
62179
diff
changeset
|
2720 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
|
2721 `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
|
2722 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
|
2723 |
475 | 2724 See also the command \\[yank-pop]." |
2725 (interactive "*P") | |
48583
150e7a54d970
(yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
48406
diff
changeset
|
2726 (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
|
2727 ;; 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
|
2728 ;; for the following command. |
a2b7fc4645d9
(undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents:
5893
diff
changeset
|
2729 (setq this-command t) |
475 | 2730 (push-mark (point)) |
44667
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
2731 (insert-for-yank (current-kill (cond |
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
2732 ((listp arg) 0) |
54058
4a5aa6868a14
(interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents:
53931
diff
changeset
|
2733 ((eq arg '-) -2) |
44667
6374552100a2
(yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents:
44664
diff
changeset
|
2734 (t (1- arg))))) |
475 | 2735 (if (consp arg) |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
2736 ;; 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
|
2737 ;; 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
|
2738 ;; 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
|
2739 (goto-char (prog1 (mark t) |
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
2740 (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
|
2741 ;; 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
|
2742 (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
|
2743 (setq this-command 'yank)) |
2111
d38d32084c15
* simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents:
2075
diff
changeset
|
2744 nil) |
715 | 2745 |
2746 (defun rotate-yank-pointer (arg) | |
2747 "Rotate the yanking point in the kill ring. | |
2748 With argument, rotate that many kills forward (or backward, if negative)." | |
2749 (interactive "p") | |
2750 (current-kill arg)) | |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
2751 |
25292 | 2752 ;; Some kill commands. |
2753 | |
2754 ;; Internal subroutine of delete-char | |
2755 (defun kill-forward-chars (arg) | |
2756 (if (listp arg) (setq arg (car arg))) | |
2757 (if (eq arg '-) (setq arg -1)) | |
2758 (kill-region (point) (forward-point arg))) | |
2759 | |
2760 ;; Internal subroutine of backward-delete-char | |
2761 (defun kill-backward-chars (arg) | |
2762 (if (listp arg) (setq arg (car arg))) | |
2763 (if (eq arg '-) (setq arg -1)) | |
2764 (kill-region (point) (forward-point (- arg)))) | |
2765 | |
2766 (defcustom backward-delete-char-untabify-method 'untabify | |
2767 "*The method for untabifying when deleting backward. | |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2768 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
|
2769 `hungry' -- delete all whitespace, both tabs and spaces; |
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2770 `all' -- delete all whitespace, including tabs, spaces and newlines; |
25292 | 2771 nil -- just delete one character." |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2772 :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
|
2773 :version "20.3" |
25292 | 2774 :group 'killing) |
2775 | |
2776 (defun backward-delete-char-untabify (arg &optional killp) | |
2777 "Delete characters backward, changing tabs into spaces. | |
2778 The exact behavior depends on `backward-delete-char-untabify-method'. | |
2779 Delete ARG chars, and kill (save in kill ring) if KILLP is non-nil. | |
2780 Interactively, ARG is the prefix arg (default 1) | |
2781 and KILLP is t if a prefix arg was specified." | |
2782 (interactive "*p\nP") | |
2783 (when (eq backward-delete-char-untabify-method 'untabify) | |
2784 (let ((count arg)) | |
2785 (save-excursion | |
2786 (while (and (> count 0) (not (bobp))) | |
2787 (if (= (preceding-char) ?\t) | |
2788 (let ((col (current-column))) | |
2789 (forward-char -1) | |
2790 (setq col (- col (current-column))) | |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
2791 (insert-char ?\s col) |
25292 | 2792 (delete-char 1))) |
2793 (forward-char -1) | |
2794 (setq count (1- count)))))) | |
2795 (delete-backward-char | |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2796 (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
|
2797 ((eq backward-delete-char-untabify-method 'all) |
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2798 " \t\n\r")))) |
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2799 (if skip |
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2800 (let ((wh (- (point) (save-excursion (skip-chars-backward skip) |
25292 | 2801 (point))))) |
2802 (+ arg (if (zerop wh) 0 (1- wh)))) | |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
2803 arg)) |
25292 | 2804 killp)) |
2805 | |
2806 (defun zap-to-char (arg char) | |
2807 "Kill up to and including ARG'th occurrence of CHAR. | |
2808 Case is ignored if `case-fold-search' is non-nil in the current buffer. | |
2809 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
|
2810 (interactive "p\ncZap to char: ") |
67446
0d03cdfa9108
(zap-to-char): Translate CHAR by
Kenichi Handa <handa@m17n.org>
parents:
67299
diff
changeset
|
2811 (if (char-table-p translation-table-for-input) |
0d03cdfa9108
(zap-to-char): Translate CHAR by
Kenichi Handa <handa@m17n.org>
parents:
67299
diff
changeset
|
2812 (setq char (or (aref translation-table-for-input char) char))) |
25292 | 2813 (kill-region (point) (progn |
2814 (search-forward (char-to-string char) nil nil arg) | |
2815 ; (goto-char (if (> arg 0) (1- (point)) (1+ (point)))) | |
2816 (point)))) | |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
2817 |
25292 | 2818 ;; kill-line and its subroutines. |
2819 | |
2820 (defcustom kill-whole-line nil | |
2821 "*If non-nil, `kill-line' with no arg at beg of line kills the whole line." | |
2822 :type 'boolean | |
2823 :group 'killing) | |
2824 | |
2825 (defun kill-line (&optional arg) | |
2826 "Kill the rest of the current line; if no nonblanks there, kill thru newline. | |
2827 With prefix argument, kill that many lines from point. | |
2828 Negative arguments kill lines backward. | |
32267 | 2829 With zero argument, kills the text before point on the current line. |
25292 | 2830 |
2831 When calling from a program, nil means \"no arg\", | |
2832 a number counts as a prefix arg. | |
2833 | |
2834 To kill a whole line, when point is not at the beginning, type \ | |
2835 \\[beginning-of-line] \\[kill-line] \\[kill-line]. | |
2836 | |
2837 If `kill-whole-line' is non-nil, then this command kills the whole line | |
2838 including its terminating newline, when used at the beginning of a line | |
2839 with no argument. As a consequence, you can always kill a whole line | |
35916 | 2840 by typing \\[beginning-of-line] \\[kill-line]. |
2841 | |
36110
116beb1b2fc7
(kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
36030
diff
changeset
|
2842 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
|
2843 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
|
2844 |
35916 | 2845 If the buffer is read-only, Emacs will beep and refrain from deleting |
2846 the line, but put the line in the kill ring anyway. This means that | |
50652 | 2847 you can use this command to copy text from a read-only buffer. |
2848 \(If the variable `kill-read-only-ok' is non-nil, then this won't | |
2849 even beep.)" | |
27836
132294fa754e
(zap-to-char, kill-line, kill-region, kill-word)
Dave Love <fx@gnu.org>
parents:
27477
diff
changeset
|
2850 (interactive "P") |
25292 | 2851 (kill-region (point) |
2852 ;; It is better to move point to the other end of the kill | |
2853 ;; before killing. That way, in a read-only buffer, point | |
2854 ;; moves across the text that is copied to the kill ring. | |
2855 ;; The choice has no effect on undo now that undo records | |
2856 ;; the value of point from before the command was run. | |
2857 (progn | |
2858 (if arg | |
2859 (forward-visible-line (prefix-numeric-value arg)) | |
2860 (if (eobp) | |
2861 (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
|
2862 (let ((end |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
2863 (save-excursion |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
2864 (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
|
2865 (if (or (save-excursion |
54259
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
2866 ;; If trailing whitespace is visible, |
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
2867 ;; 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
|
2868 (unless show-trailing-whitespace |
86345e064999
(undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents:
54058
diff
changeset
|
2869 (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
|
2870 (= (point) end)) |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
2871 (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
|
2872 (forward-visible-line 1) |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
2873 (goto-char end)))) |
25292 | 2874 (point)))) |
2875 | |
51101
821f85e23a1f
* simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51026
diff
changeset
|
2876 (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
|
2877 "Kill current line. |
51324
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
2878 With prefix arg, kill that many lines starting from the current line. |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
2879 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
|
2880 \(This is meant to make \\[repeat] work well with negative arguments.\) |
51101
821f85e23a1f
* simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51026
diff
changeset
|
2881 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
|
2882 (interactive "p") |
51324
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
2883 (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
|
2884 (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
|
2885 (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
|
2886 (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
|
2887 (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
|
2888 (kill-new "") |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
2889 (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
|
2890 (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
|
2891 ;; 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
|
2892 ;; 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
|
2893 ;; 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
|
2894 ;; 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
|
2895 ;; 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
|
2896 ;; 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
|
2897 (save-excursion |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
2898 (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
|
2899 (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
|
2900 ((< arg 0) |
51324
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
2901 (save-excursion |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
2902 (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
|
2903 (kill-region (point) |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
2904 (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
|
2905 (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
|
2906 (point)))) |
51101
821f85e23a1f
* simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
51026
diff
changeset
|
2907 (t |
51324
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
2908 (save-excursion |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
2909 (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
|
2910 (kill-region (point) |
dfd8b52708ae
(kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51304
diff
changeset
|
2911 (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
|
2912 |
25292 | 2913 (defun forward-visible-line (arg) |
2914 "Move forward by ARG lines, ignoring currently invisible newlines only. | |
2915 If ARG is negative, move backward -ARG lines. | |
2916 If ARG is zero, move to the beginning of the current line." | |
2917 (condition-case nil | |
2918 (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
|
2919 (progn |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
2920 (while (> arg 0) |
25292 | 2921 (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
|
2922 (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
|
2923 ;; 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
|
2924 ;; 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
|
2925 (let ((prop |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
2926 (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
|
2927 (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
|
2928 prop |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
2929 (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
|
2930 (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
|
2931 (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
|
2932 (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
|
2933 ;; 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
|
2934 ;; skip it. |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
2935 (let ((opoint (point))) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
2936 (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
|
2937 (let ((prop |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
2938 (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
|
2939 (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
|
2940 prop |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
2941 (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
|
2942 (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
|
2943 (goto-char |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
2944 (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
|
2945 (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
|
2946 (point-max)) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
2947 (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
|
2948 (unless (bolp) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
2949 (goto-char opoint)))) |
25292 | 2950 (let ((first t)) |
51219
b86109f9a829
(forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
51118
diff
changeset
|
2951 (while (or first (<= arg 0)) |
b86109f9a829
(forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
51118
diff
changeset
|
2952 (if first |
25292 | 2953 (beginning-of-line) |
2954 (or (zerop (forward-line -1)) | |
2955 (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
|
2956 ;; 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
|
2957 ;; 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
|
2958 (unless (bobp) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
2959 (let ((prop |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
2960 (get-char-property (1- (point)) 'invisible))) |
51219
b86109f9a829
(forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
51118
diff
changeset
|
2961 (unless (if (eq buffer-invisibility-spec t) |
b86109f9a829
(forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
51118
diff
changeset
|
2962 prop |
b86109f9a829
(forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
51118
diff
changeset
|
2963 (or (memq prop buffer-invisibility-spec) |
b86109f9a829
(forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
51118
diff
changeset
|
2964 (assq prop buffer-invisibility-spec))) |
b86109f9a829
(forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
51118
diff
changeset
|
2965 (setq arg (1+ arg))))) |
b86109f9a829
(forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents:
51118
diff
changeset
|
2966 (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
|
2967 ;; 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
|
2968 ;; skip it. |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
2969 (let ((opoint (point))) |
25292 | 2970 (while (and (not (bobp)) |
2971 (let ((prop | |
2972 (get-char-property (1- (point)) 'invisible))) | |
2973 (if (eq buffer-invisibility-spec t) | |
2974 prop | |
2975 (or (memq prop buffer-invisibility-spec) | |
2976 (assq prop buffer-invisibility-spec))))) | |
2977 (goto-char | |
2978 (if (get-text-property (1- (point)) 'invisible) | |
2979 (or (previous-single-property-change (point) 'invisible) | |
2980 (point-min)) | |
47316
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
2981 (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
|
2982 (unless (bolp) |
c4537edce898
(undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents:
47266
diff
changeset
|
2983 (goto-char opoint))))) |
25292 | 2984 ((beginning-of-buffer end-of-buffer) |
2985 nil))) | |
2986 | |
2987 (defun end-of-visible-line () | |
2988 "Move to end of current visible line." | |
2989 (end-of-line) | |
2990 ;; If the following character is currently invisible, | |
2991 ;; skip all characters with that same `invisible' property value, | |
2992 ;; then find the next newline. | |
2993 (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
|
2994 (save-excursion |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
2995 (skip-chars-forward "^\n") |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
2996 (let ((prop |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
2997 (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
|
2998 (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
|
2999 prop |
1f4d03aef3cf
(kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents:
46872
diff
changeset
|
3000 (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
|
3001 (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
|
3002 (skip-chars-forward "^\n") |
25292 | 3003 (if (get-text-property (point) 'invisible) |
3004 (goto-char (next-single-property-change (point) 'invisible)) | |
3005 (goto-char (next-overlay-change (point)))) | |
3006 (end-of-line))) | |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
3007 |
475 | 3008 (defun insert-buffer (buffer) |
3009 "Insert after point the contents of BUFFER. | |
3010 Puts mark after the inserted text. | |
26723 | 3011 BUFFER may be a buffer or a buffer name. |
3012 | |
3013 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
|
3014 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
|
3015 (interactive |
14834
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
3016 (list |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
3017 (progn |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
3018 (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
|
3019 (read-buffer "Insert buffer: " |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
3020 (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
|
3021 (other-buffer (current-buffer)) |
5ae5d97727ce
* simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents:
14721
diff
changeset
|
3022 (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
|
3023 t)))) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
3024 (push-mark |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
3025 (save-excursion |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
3026 (insert-buffer-substring (get-buffer buffer)) |
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
3027 (point))) |
1982
d65c1fefc636
* simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents:
1838
diff
changeset
|
3028 nil) |
475 | 3029 |
3030 (defun append-to-buffer (buffer start end) | |
3031 "Append to specified buffer the text of the region. | |
3032 It is inserted into that buffer before its point. | |
3033 | |
3034 When calling from a program, give three arguments: | |
3035 BUFFER (or buffer name), START and END. | |
3036 START and END specify the portion of the current buffer to be copied." | |
715 | 3037 (interactive |
10048
db01a04d2afb
(append-to-buffer): Don't use current buffer as default.
Richard M. Stallman <rms@gnu.org>
parents:
10034
diff
changeset
|
3038 (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
|
3039 (region-beginning) (region-end))) |
475 | 3040 (let ((oldbuf (current-buffer))) |
3041 (save-excursion | |
28187
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3042 (let* ((append-to (get-buffer-create buffer)) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3043 (windows (get-buffer-window-list append-to t t)) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3044 point) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3045 (set-buffer append-to) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3046 (setq point (point)) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3047 (barf-if-buffer-read-only) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3048 (insert-buffer-substring oldbuf start end) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3049 (dolist (window windows) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3050 (when (= (window-point window) point) |
507041681c73
(append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents:
28113
diff
changeset
|
3051 (set-window-point window (point)))))))) |
475 | 3052 |
3053 (defun prepend-to-buffer (buffer start end) | |
3054 "Prepend to specified buffer the text of the region. | |
3055 It is inserted into that buffer after its point. | |
3056 | |
3057 When calling from a program, give three arguments: | |
3058 BUFFER (or buffer name), START and END. | |
3059 START and END specify the portion of the current buffer to be copied." | |
3060 (interactive "BPrepend to buffer: \nr") | |
3061 (let ((oldbuf (current-buffer))) | |
3062 (save-excursion | |
3063 (set-buffer (get-buffer-create buffer)) | |
24973
57d2a2f294cb
(append-to-buffer, prepend-to-buffer, copy-to-buffer): Check for
Dave Love <fx@gnu.org>
parents:
24831
diff
changeset
|
3064 (barf-if-buffer-read-only) |
475 | 3065 (save-excursion |
3066 (insert-buffer-substring oldbuf start end))))) | |
3067 | |
3068 (defun copy-to-buffer (buffer start end) | |
3069 "Copy to specified buffer the text of the region. | |
3070 It is inserted into that buffer, replacing existing text there. | |
3071 | |
3072 When calling from a program, give three arguments: | |
3073 BUFFER (or buffer name), START and END. | |
3074 START and END specify the portion of the current buffer to be copied." | |
3075 (interactive "BCopy to buffer: \nr") | |
3076 (let ((oldbuf (current-buffer))) | |
66595
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
3077 (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
|
3078 (barf-if-buffer-read-only) |
475 | 3079 (erase-buffer) |
3080 (save-excursion | |
3081 (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
|
3082 |
4040
d06d7295d3eb
Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents:
3967
diff
changeset
|
3083 (put 'mark-inactive 'error-conditions '(mark-inactive error)) |
d06d7295d3eb
Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents:
3967
diff
changeset
|
3084 (put 'mark-inactive 'error-message "The mark is not active now") |
d06d7295d3eb
Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents:
3967
diff
changeset
|
3085 |
60463
be3ac492036f
(activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
60414
diff
changeset
|
3086 (defvar activate-mark-hook nil |
be3ac492036f
(activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
60414
diff
changeset
|
3087 "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
|
3088 It is also run at the end of a command, if the mark is active and |
be3ac492036f
(activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
60414
diff
changeset
|
3089 it is possible that the region may have changed") |
be3ac492036f
(activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
60414
diff
changeset
|
3090 |
be3ac492036f
(activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
60414
diff
changeset
|
3091 (defvar deactivate-mark-hook nil |
be3ac492036f
(activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
60414
diff
changeset
|
3092 "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
|
3093 |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
3094 (defun mark (&optional force) |
68042 | 3095 "Return this buffer's mark value as integer, or nil if never set. |
3096 | |
3097 In Transient Mark mode, this function signals an error if | |
3098 the mark is not active. However, if `mark-even-if-inactive' is non-nil, | |
3099 or the argument FORCE is non-nil, it disregards whether the mark | |
3100 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
|
3101 |
475 | 3102 If you are using this in an editing command, you are most likely making |
3103 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
|
3104 (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
|
3105 (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
|
3106 (signal 'mark-inactive nil))) |
475 | 3107 |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
3108 ;; Many places set mark-active directly, and several of them failed to also |
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
3109 ;; run deactivate-mark-hook. This shorthand should simplify. |
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
3110 (defsubst deactivate-mark () |
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
3111 "Deactivate the mark by setting `mark-active' to nil. |
4287
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
3112 \(That makes a difference only in Transient Mark mode.) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
3113 Also runs the hook `deactivate-mark-hook'." |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3114 (cond |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3115 ((eq transient-mark-mode 'lambda) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3116 (setq transient-mark-mode nil)) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3117 (transient-mark-mode |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3118 (setq mark-active nil) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3119 (run-hooks 'deactivate-mark-hook)))) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
3120 |
475 | 3121 (defun set-mark (pos) |
3122 "Set this buffer's mark to POS. Don't use this function! | |
3123 That is to say, don't use this function unless you want | |
3124 the user to see that the mark has moved, and you want the previous | |
3125 mark position to be lost. | |
3126 | |
3127 Normally, when a new mark is set, the old one should go on the stack. | |
61121 | 3128 This is why most applications should use `push-mark', not `set-mark'. |
475 | 3129 |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
3130 Novice Emacs Lisp programmers often try to use the mark for the wrong |
475 | 3131 purposes. The mark saves a location for the user's convenience. |
3132 Most editing commands should not alter the mark. | |
3133 To remember a location for internal use in the Lisp program, | |
3134 store it in a Lisp variable. Example: | |
3135 | |
3136 (let ((beg (point))) (forward-line 1) (delete-region beg (point)))." | |
3137 | |
4287
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
3138 (if pos |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
3139 (progn |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
3140 (setq mark-active t) |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
3141 (run-hooks 'activate-mark-hook) |
20486b99584f
(kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents:
4217
diff
changeset
|
3142 (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
|
3143 ;; Normally we never clear mark-active except in Transient Mark mode. |
bb7bd2b068bf
(set-mark): When POS is nil, always clear mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
8604
diff
changeset
|
3144 ;; But when we actually clear out the mark value too, |
bb7bd2b068bf
(set-mark): When POS is nil, always clear mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
8604
diff
changeset
|
3145 ;; we must clear mark-active in any mode. |
bb7bd2b068bf
(set-mark): When POS is nil, always clear mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
8604
diff
changeset
|
3146 (setq mark-active nil) |
bb7bd2b068bf
(set-mark): When POS is nil, always clear mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
8604
diff
changeset
|
3147 (run-hooks 'deactivate-mark-hook) |
bb7bd2b068bf
(set-mark): When POS is nil, always clear mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
8604
diff
changeset
|
3148 (set-marker (mark-marker) nil))) |
475 | 3149 |
3150 (defvar mark-ring nil | |
8695
0f702e9ab06d
(mark-ring): Add permanent-local prop. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
8660
diff
changeset
|
3151 "The list of former marks of the current buffer, most recent first.") |
475 | 3152 (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
|
3153 (put 'mark-ring 'permanent-local t) |
475 | 3154 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3155 (defcustom mark-ring-max 16 |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3156 "*Maximum size of mark ring. Start discarding off end if gets this big." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3157 :type 'integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3158 :group 'editing-basics) |
475 | 3159 |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3160 (defvar global-mark-ring nil |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3161 "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
|
3162 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3163 (defcustom global-mark-ring-max 16 |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3164 "*Maximum size of global mark ring. \ |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3165 Start discarding off end if gets this big." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3166 :type 'integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3167 :group 'editing-basics) |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3168 |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3169 (defun pop-to-mark-command () |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3170 "Jump to mark, and pop a new position for mark off the ring |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3171 \(does not affect global mark ring\)." |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3172 (interactive) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3173 (if (null (mark t)) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3174 (error "No mark set in this buffer") |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3175 (goto-char (mark t)) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3176 (pop-mark))) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3177 |
45540
1756da24c6ba
(push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents:
45386
diff
changeset
|
3178 (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
|
3179 "Set mark at where point is. |
45540
1756da24c6ba
(push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents:
45386
diff
changeset
|
3180 If no prefix arg and mark is already set there, just activate it. |
1756da24c6ba
(push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents:
45386
diff
changeset
|
3181 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
|
3182 (interactive "P") |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3183 (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
|
3184 (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
|
3185 (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
|
3186 (setq mark-active t) |
60463
be3ac492036f
(activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents:
60414
diff
changeset
|
3187 (run-hooks 'activate-mark-hook) |
45540
1756da24c6ba
(push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents:
45386
diff
changeset
|
3188 (unless nomsg |
1756da24c6ba
(push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents:
45386
diff
changeset
|
3189 (message "Mark activated"))))) |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3190 |
66671
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3191 (defcustom set-mark-command-repeat-pop nil |
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3192 "*Non-nil means that repeating \\[set-mark-command] after popping will pop. |
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3193 This means that if you type C-u \\[set-mark-command] \\[set-mark-command] |
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3194 will pop twice." |
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3195 :type 'boolean |
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3196 :group 'editing) |
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3197 |
475 | 3198 (defun set-mark-command (arg) |
3199 "Set mark at where point is, or jump to mark. | |
50251
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3200 With no prefix argument, set mark, and push old mark position on local |
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3201 mark ring; also push mark on global mark ring if last mark was set in |
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3202 another buffer. Immediately repeating the command activates |
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3203 `transient-mark-mode' temporarily. |
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3204 |
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3205 With argument, e.g. \\[universal-argument] \\[set-mark-command], \ |
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3206 jump to mark, and pop a new position |
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3207 for mark off the local mark ring \(this does not affect the global |
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3208 mark ring\). Use \\[pop-global-mark] to jump to a mark off the global |
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3209 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
|
3210 |
68280
c1db05754431
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68042
diff
changeset
|
3211 If `set-mark-command-repeat-pop' is non-nil, repeating |
c1db05754431
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68042
diff
changeset
|
3212 the \\[set-mark-command] command with no prefix pops the next position |
c1db05754431
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68042
diff
changeset
|
3213 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
|
3214 |
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3215 With a double \\[universal-argument] prefix argument, e.g. \\[universal-argument] \ |
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3216 \\[universal-argument] \\[set-mark-command], unconditionally |
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3217 set mark where point is. |
475 | 3218 |
69602
5dfbb2116f2d
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
69410
diff
changeset
|
3219 Setting the mark also sets the \"region\", which is the closest |
5dfbb2116f2d
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
69410
diff
changeset
|
3220 equivalent in Emacs to what some editors call the \"selection\". |
5dfbb2116f2d
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
69410
diff
changeset
|
3221 |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
3222 Novice Emacs Lisp programmers often try to use the mark for the wrong |
475 | 3223 purposes. See the documentation of `set-mark' for more information." |
3224 (interactive "P") | |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3225 (if (eq transient-mark-mode 'lambda) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3226 (setq transient-mark-mode nil)) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3227 (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
|
3228 ((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
|
3229 (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
|
3230 ((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
|
3231 (if arg |
92b336df72b8
(pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents:
44586
diff
changeset
|
3232 (pop-to-mark-command) |
92b336df72b8
(pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents:
44586
diff
changeset
|
3233 (push-mark-command t))) |
66671
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3234 ((and set-mark-command-repeat-pop |
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3235 (eq last-command 'pop-to-mark-command)) |
50251
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3236 (setq this-command 'pop-to-mark-command) |
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3237 (pop-to-mark-command)) |
66671
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3238 ((and set-mark-command-repeat-pop |
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3239 (eq last-command 'pop-global-mark) |
be6d79a520af
(set-mark-command-repeat-pop): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
66595
diff
changeset
|
3240 (not arg)) |
50251
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3241 (setq this-command 'pop-global-mark) |
4893760b5129
(set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents:
49784
diff
changeset
|
3242 (pop-global-mark)) |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3243 (arg |
44664
92b336df72b8
(pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents:
44586
diff
changeset
|
3244 (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
|
3245 (pop-to-mark-command)) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3246 ((and (eq last-command 'set-mark-command) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3247 mark-active (null transient-mark-mode)) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3248 (setq transient-mark-mode 'lambda) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3249 (message "Transient-mark-mode temporarily enabled")) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3250 (t |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3251 (push-mark-command nil)))) |
475 | 3252 |
2824
c684bce3e977
(yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2805
diff
changeset
|
3253 (defun push-mark (&optional location nomsg activate) |
475 | 3254 "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
|
3255 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
|
3256 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
|
3257 Display `Mark set' unless the optional second arg NOMSG is non-nil. |
2844
086fda6b2041
(push-mark): Always activate the mark if not in Transient Mark mode.
Richard M. Stallman <rms@gnu.org>
parents:
2824
diff
changeset
|
3258 In Transient Mark mode, activate mark if optional third arg ACTIVATE non-nil. |
475 | 3259 |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
3260 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
|
3261 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
|
3262 |
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
3263 In Transient Mark mode, this does not activate the mark." |
52046
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
3264 (unless (null (mark t)) |
475 | 3265 (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
|
3266 (when (> (length mark-ring) mark-ring-max) |
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
3267 (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
|
3268 (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
|
3269 (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
|
3270 ;; 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
|
3271 (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
|
3272 (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
|
3273 ;; 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
|
3274 ;; 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
|
3275 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
|
3276 (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
|
3277 (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
|
3278 (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
|
3279 (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
|
3280 (or nomsg executing-kbd-macro (> (minibuffer-depth) 0) |
475 | 3281 (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
|
3282 (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
|
3283 (set-mark (mark t))) |
475 | 3284 nil) |
3285 | |
3286 (defun pop-mark () | |
3287 "Pop off mark ring into the buffer's actual mark. | |
3288 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
|
3289 (when mark-ring |
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
3290 (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
|
3291 (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
|
3292 (move-marker (car mark-ring) nil) |
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
3293 (if (null (mark t)) (ding)) |
59486
3b3f211ffa93
(pop-mark): Move deactivate-mark out of conditional
Juri Linkov <juri@jurta.org>
parents:
59397
diff
changeset
|
3294 (setq mark-ring (cdr mark-ring))) |
3b3f211ffa93
(pop-mark): Move deactivate-mark out of conditional
Juri Linkov <juri@jurta.org>
parents:
59397
diff
changeset
|
3295 (deactivate-mark)) |
475 | 3296 |
16436
d2acc84badf4
Use defalias not define-function.
Richard M. Stallman <rms@gnu.org>
parents:
16417
diff
changeset
|
3297 (defalias 'exchange-dot-and-mark 'exchange-point-and-mark) |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3298 (defun exchange-point-and-mark (&optional arg) |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
3299 "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
|
3300 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
|
3301 and it reactivates the mark. |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3302 With prefix arg, `transient-mark-mode' is enabled temporarily." |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3303 (interactive "P") |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3304 (if arg |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49585
diff
changeset
|
3305 (if mark-active |
44586
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3306 (if (null transient-mark-mode) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3307 (setq transient-mark-mode 'lambda)) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3308 (setq arg nil))) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3309 (unless arg |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3310 (let ((omark (mark t))) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3311 (if (null omark) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3312 (error "No mark set in this buffer")) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3313 (set-mark (point)) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3314 (goto-char omark) |
2776503d098e
(pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents:
44505
diff
changeset
|
3315 nil))) |
2796
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
3316 |
47408
2239db3433ca
(transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47364
diff
changeset
|
3317 (define-minor-mode transient-mark-mode |
2796
e0a9c4815584
(transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents:
2681
diff
changeset
|
3318 "Toggle Transient Mark mode. |
2935
653e14f61220
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
2850
diff
changeset
|
3319 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
|
3320 |
5372
ac927443eae9
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5343
diff
changeset
|
3321 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
|
3322 Changing the buffer \"deactivates\" the mark. |
ac927443eae9
(transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
5343
diff
changeset
|
3323 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
|
3324 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
|
3325 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
|
3326 |
37092
c365952bf534
(transient-mark-mode): Mention ESC ESC ESC in the doc string as well.
Eli Zaretskii <eliz@gnu.org>
parents:
37074
diff
changeset
|
3327 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
|
3328 \\[keyboard-escape-quit]. |
37074
43067b78ec71
(transient-mark-mode): Mention C-g in the doc string.
Eli Zaretskii <eliz@gnu.org>
parents:
36668
diff
changeset
|
3329 |
35631
bc0a3dbd22f6
(transient-mark-mode): Document the fact that many
Eli Zaretskii <eliz@gnu.org>
parents:
35589
diff
changeset
|
3330 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
|
3331 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
|
3332 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
|
3333 \\[comment-dwim], \\[flush-lines], \\[keep-lines], \ |
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
3334 \\[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
|
3335 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
|
3336 \"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
|
3337 commands which are sensitive to the Transient Mark mode." |
67243
4f8e0edba613
(transient-mark-mode, line-number-mode)
Luc Teirlinck <teirllm@auburn.edu>
parents:
67213
diff
changeset
|
3338 :global t :group 'editing-basics) |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3339 |
61986
91b85d61710d
(widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
61950
diff
changeset
|
3340 (defvar widen-automatically t |
91b85d61710d
(widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
61950
diff
changeset
|
3341 "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
|
3342 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
|
3343 the current accessible part of the buffer. |
91b85d61710d
(widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
61950
diff
changeset
|
3344 |
91b85d61710d
(widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
61950
diff
changeset
|
3345 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
|
3346 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
|
3347 |
5811
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3348 (defun pop-global-mark () |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3349 "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
|
3350 (interactive) |
7881
4ab8723cd491
(pop-global-mark): Discard entries for nonexistent buffers.
Richard M. Stallman <rms@gnu.org>
parents:
7877
diff
changeset
|
3351 ;; 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
|
3352 (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
|
3353 (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
|
3354 (or global-mark-ring |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3355 (error "No global mark set")) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3356 (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
|
3357 (buffer (marker-buffer marker)) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3358 (position (marker-position marker))) |
10351
e34cbd5276bd
(pop-global-mark): Make pop-global-mark treat
Richard M. Stallman <rms@gnu.org>
parents:
10284
diff
changeset
|
3359 (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
|
3360 (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
|
3361 (set-buffer buffer) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3362 (or (and (>= position (point-min)) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3363 (<= position (point-max))) |
61986
91b85d61710d
(widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
61950
diff
changeset
|
3364 (if widen-automatically |
64911
08a222d72566
(pop-global-mark): Reverse test of widen-automatically.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
3365 (widen) |
08a222d72566
(pop-global-mark): Reverse test of widen-automatically.
Richard M. Stallman <rms@gnu.org>
parents:
64762
diff
changeset
|
3366 (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
|
3367 (goto-char position) |
7cc27fc3c661
(global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents:
5805
diff
changeset
|
3368 (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
|
3369 |
34101
559c35839090
(next-line-add-newlines): Change default to nil.
Gerd Moellmann <gerd@gnu.org>
parents:
34071
diff
changeset
|
3370 (defcustom next-line-add-newlines nil |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3371 "*If non-nil, `next-line' inserts newline to avoid `end of buffer' error." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3372 :type 'boolean |
35333
ac14700e2c6b
(next-line-add-newlines): Add :version.
Dave Love <fx@gnu.org>
parents:
35327
diff
changeset
|
3373 :version "21.1" |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3374 :group 'editing-basics) |
2568
15014ba142a7
All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2446
diff
changeset
|
3375 |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3376 (defun next-line (&optional arg try-vscroll) |
475 | 3377 "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
|
3378 Interactively, vscroll tall lines if `auto-window-vscroll' is enabled. |
475 | 3379 If there is no character in the target line exactly under the current column, |
3380 the cursor is positioned after the character in that line which spans this | |
3381 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
|
3382 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
|
3383 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
|
3384 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
|
3385 cursor to the end of the buffer. |
475 | 3386 |
3387 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
|
3388 a semipermanent goal column for this command. |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
3389 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
|
3390 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
|
3391 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
|
3392 when there is no goal column. |
475 | 3393 |
3394 If you are thinking of using this in a Lisp program, consider | |
3395 using `forward-line' instead. It is usually easier to use | |
3396 and more reliable (no dependence on goal column, etc.)." | |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3397 (interactive "p\np") |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
3398 (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
|
3399 (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
|
3400 (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
|
3401 ;; 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
|
3402 (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
|
3403 (end-of-line) |
67213
818361523ce8
* longlines.el (longlines-mode): Add mail-setup-hook.
Chong Yidong <cyd@stupidchicken.com>
parents:
67181
diff
changeset
|
3404 (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
|
3405 (line-move arg nil nil try-vscroll)) |
10226
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
3406 (if (interactive-p) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
3407 (condition-case nil |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3408 (line-move arg nil nil try-vscroll) |
10226
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
3409 ((beginning-of-buffer end-of-buffer) (ding))) |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3410 (line-move arg nil nil try-vscroll))) |
475 | 3411 nil) |
3412 | |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3413 (defun previous-line (&optional arg try-vscroll) |
475 | 3414 "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
|
3415 Interactively, vscroll tall lines if `auto-window-vscroll' is enabled. |
475 | 3416 If there is no character in the target line exactly over the current column, |
3417 the cursor is positioned after the character in that line which spans this | |
3418 column, or at the end of the line if it is not long enough. | |
3419 | |
3420 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
|
3421 a semipermanent goal column for this command. |
3c958a136c4a
(next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents:
18498
diff
changeset
|
3422 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
|
3423 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
|
3424 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
|
3425 when there is no goal column. |
475 | 3426 |
3427 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
|
3428 `forward-line' with a negative argument instead. It is usually easier |
475 | 3429 to use and more reliable (no dependence on goal column, etc.)." |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3430 (interactive "p\np") |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
3431 (or arg (setq arg 1)) |
10226
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
3432 (if (interactive-p) |
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
3433 (condition-case nil |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3434 (line-move (- arg) nil nil try-vscroll) |
10226
1817c5332316
(next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents:
10165
diff
changeset
|
3435 ((beginning-of-buffer end-of-buffer) (ding))) |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3436 (line-move (- arg) nil nil try-vscroll)) |
475 | 3437 nil) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
3438 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3439 (defcustom track-eol nil |
475 | 3440 "*Non-nil means vertical motion starting at end of line keeps to ends of lines. |
3441 This means moving to the end of each line moved onto. | |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3442 The beginning of a blank line does not count as the end of a line." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3443 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3444 :group 'editing-basics) |
475 | 3445 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3446 (defcustom goal-column nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3447 "*Semipermanent goal column for vertical motion, as set by \\[set-goal-column], or nil." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3448 :type '(choice integer |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3449 (const :tag "None" nil)) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3450 :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
|
3451 (make-variable-buffer-local 'goal-column) |
475 | 3452 |
3453 (defvar temporary-goal-column 0 | |
3454 "Current goal column for vertical motion. | |
3455 It is the column where point was | |
3456 at the start of current run of vertical motion commands. | |
513 | 3457 When the `track-eol' feature is doing its job, the value is 9999.") |
475 | 3458 |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3459 (defcustom line-move-ignore-invisible t |
10949
99c9f475a355
(line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10943
diff
changeset
|
3460 "*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
|
3461 Outline mode sets this." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3462 :type 'boolean |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
3463 :group 'editing-basics) |
10949
99c9f475a355
(line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10943
diff
changeset
|
3464 |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3465 (defun line-move-invisible-p (pos) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3466 "Return non-nil if the character after POS is currently invisible." |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3467 (let ((prop |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3468 (get-char-property pos 'invisible))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3469 (if (eq buffer-invisibility-spec t) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3470 prop |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3471 (or (memq prop buffer-invisibility-spec) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3472 (assq prop buffer-invisibility-spec))))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3473 |
63136 | 3474 ;; This is like line-move-1 except that it also performs |
3475 ;; vertical scrolling of tall images if appropriate. | |
3476 ;; That is not really a clean thing to do, since it mixes | |
3477 ;; scrolling with cursor motion. But so far we don't have | |
3478 ;; a cleaner solution to the problem of making C-n do something | |
3479 ;; 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
|
3480 (defun line-move (arg &optional noerror to-end try-vscroll) |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3481 (if (and auto-window-vscroll try-vscroll |
63136 | 3482 ;; But don't vscroll in a keyboard macro. |
60590
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3483 (not defining-kbd-macro) |
1b9a61c42a06
(next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents:
60486
diff
changeset
|
3484 (not executing-kbd-macro)) |
59680
1d33b3da1157
(line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents:
59626
diff
changeset
|
3485 (let ((forward (> arg 0)) |
59701
5f125540565b
* simple.el (line-move): Adapt to new return value from
Kim F. Storm <storm@cua.dk>
parents:
59698
diff
changeset
|
3486 (part (nth 2 (pos-visible-in-window-p (point) nil t)))) |
5f125540565b
* simple.el (line-move): Adapt to new return value from
Kim F. Storm <storm@cua.dk>
parents:
59698
diff
changeset
|
3487 (if (and (consp part) |
62987
5378f1ac43f4
(line-move): Only call sit-for when moving backwards.
Kim F. Storm <storm@cua.dk>
parents:
62919
diff
changeset
|
3488 (> (if forward (cdr part) (car part)) 0)) |
59680
1d33b3da1157
(line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents:
59626
diff
changeset
|
3489 (set-window-vscroll nil |
1d33b3da1157
(line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents:
59626
diff
changeset
|
3490 (if forward |
1d33b3da1157
(line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents:
59626
diff
changeset
|
3491 (+ (window-vscroll nil t) |
62987
5378f1ac43f4
(line-move): Only call sit-for when moving backwards.
Kim F. Storm <storm@cua.dk>
parents:
62919
diff
changeset
|
3492 (min (cdr part) |
59680
1d33b3da1157
(line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents:
59626
diff
changeset
|
3493 (* (frame-char-height) arg))) |
1d33b3da1157
(line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents:
59626
diff
changeset
|
3494 (max 0 |
1d33b3da1157
(line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents:
59626
diff
changeset
|
3495 (- (window-vscroll nil t) |
62987
5378f1ac43f4
(line-move): Only call sit-for when moving backwards.
Kim F. Storm <storm@cua.dk>
parents:
62919
diff
changeset
|
3496 (min (car part) |
59680
1d33b3da1157
(line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents:
59626
diff
changeset
|
3497 (* (frame-char-height) (- arg)))))) |
1d33b3da1157
(line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents:
59626
diff
changeset
|
3498 t) |
1d33b3da1157
(line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents:
59626
diff
changeset
|
3499 (set-window-vscroll nil 0) |
60176
9440f8bb9f71
(line-move): Add fourth optional arg try-vscroll which
Kim F. Storm <storm@cua.dk>
parents:
60007
diff
changeset
|
3500 (when (line-move-1 arg noerror to-end) |
62987
5378f1ac43f4
(line-move): Only call sit-for when moving backwards.
Kim F. Storm <storm@cua.dk>
parents:
62919
diff
changeset
|
3501 (when (not forward) |
63037
e7db86688ce6
Add comment to line-move re. sit-for.
Kim F. Storm <storm@cua.dk>
parents:
63022
diff
changeset
|
3502 ;; Update display before calling pos-visible-in-window-p, |
e7db86688ce6
Add comment to line-move re. sit-for.
Kim F. Storm <storm@cua.dk>
parents:
63022
diff
changeset
|
3503 ;; because it depends on window-start being up-to-date. |
62987
5378f1ac43f4
(line-move): Only call sit-for when moving backwards.
Kim F. Storm <storm@cua.dk>
parents:
62919
diff
changeset
|
3504 (sit-for 0) |
63136 | 3505 ;; If the current line is partly hidden at the bottom, |
3506 ;; scroll it partially up so as to unhide the bottom. | |
62987
5378f1ac43f4
(line-move): Only call sit-for when moving backwards.
Kim F. Storm <storm@cua.dk>
parents:
62919
diff
changeset
|
3507 (if (and (setq part (nth 2 (pos-visible-in-window-p |
5378f1ac43f4
(line-move): Only call sit-for when moving backwards.
Kim F. Storm <storm@cua.dk>
parents:
62919
diff
changeset
|
3508 (line-beginning-position) nil t))) |
5378f1ac43f4
(line-move): Only call sit-for when moving backwards.
Kim F. Storm <storm@cua.dk>
parents:
62919
diff
changeset
|
3509 (> (cdr part) 0)) |
5378f1ac43f4
(line-move): Only call sit-for when moving backwards.
Kim F. Storm <storm@cua.dk>
parents:
62919
diff
changeset
|
3510 (set-window-vscroll nil (cdr part) t))) |
60176
9440f8bb9f71
(line-move): Add fourth optional arg try-vscroll which
Kim F. Storm <storm@cua.dk>
parents:
60007
diff
changeset
|
3511 t))) |
59680
1d33b3da1157
(line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents:
59626
diff
changeset
|
3512 (line-move-1 arg noerror to-end))) |
1d33b3da1157
(line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents:
59626
diff
changeset
|
3513 |
11326
0d5ebc078c51
(line-move): Turn off intangibility for intermediate stops.
Richard M. Stallman <rms@gnu.org>
parents:
11324
diff
changeset
|
3514 ;; 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
|
3515 ;; 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
|
3516 ;; 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
|
3517 (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
|
3518 ;; 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
|
3519 ;; for intermediate positions. |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
3520 (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
|
3521 (opoint (point)) |
58754
b41534d7c63c
(blink-matching-open): Obey syntax-table text properties.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
58625
diff
changeset
|
3522 (forward (> arg 0))) |
11479
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
3523 (unwind-protect |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
3524 (progn |
44505
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3525 (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
|
3526 (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
|
3527 (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
|
3528 ;; 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
|
3529 ;; unless we just did explicit end-of-line. |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
3530 (or (not (bolp)) (eq last-command 'end-of-line))) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
3531 9999 |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
3532 (current-column)))) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3533 |
11479
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
3534 (if (and (not (integerp selective-display)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
3535 (not line-move-ignore-invisible)) |
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
3536 ;; 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
|
3537 ;; 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
|
3538 (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
|
3539 (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
|
3540 ;; 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
|
3541 ;; 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
|
3542 ;; 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
|
3543 (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
|
3544 (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
|
3545 (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
|
3546 (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
|
3547 (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
|
3548 (setq arg 0))) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3549 (unless noerror |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3550 (signal (if (< arg 0) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3551 'beginning-of-buffer |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3552 'end-of-buffer) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3553 nil))) |
11479
266653a85b65
(line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents:
11362
diff
changeset
|
3554 ;; Move by arg lines, but ignore invisible ones. |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3555 (let (done) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3556 (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
|
3557 ;; 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
|
3558 ;; skip all characters with that same `invisible' property value. |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3559 (while (and (not (eobp)) (line-move-invisible-p (point))) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3560 (goto-char (next-char-property-change (point)))) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3561 ;; Now move a line. |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3562 (end-of-line) |
61864
af1b504ffc35
(line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents:
61671
diff
changeset
|
3563 ;; 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
|
3564 (cond |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3565 ((eobp) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3566 (if (not noerror) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3567 (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
|
3568 (setq done t))) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3569 ((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
|
3570 (not (integerp selective-display)) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3571 (not (line-move-invisible-p (point)))) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3572 ;; 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
|
3573 ;; 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
|
3574 (forward-line 1)) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3575 ;; 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
|
3576 ((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
|
3577 (if (not noerror) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3578 (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
|
3579 (setq done t)))) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3580 (unless done |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3581 (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
|
3582 ;; 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
|
3583 ;; 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
|
3584 (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
|
3585 (beginning-of-line) |
64289
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3586 (cond |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3587 ((bobp) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3588 (if (not noerror) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3589 (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
|
3590 (setq done t))) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3591 ((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
|
3592 (not (integerp selective-display)) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3593 (not (line-move-invisible-p (1- (point))))) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3594 (forward-line -1)) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3595 ((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
|
3596 (if (not noerror) |
549c22d3fe54
(line-move-1): Undo rest of 2005-06-23 change.
Kim F. Storm <storm@cua.dk>
parents:
64285
diff
changeset
|
3597 (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
|
3598 (setq done t)))) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3599 (unless done |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3600 (setq arg (1+ arg)) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3601 (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
|
3602 ;; 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
|
3603 (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
|
3604 (< arg 0)) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3605 (not (bobp)) (line-move-invisible-p (1- (point)))) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3606 (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
|
3607 ;; 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
|
3608 (= arg 0)) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3609 |
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
|
3610 (cond ((> arg 0) |
b9928a414b19
(line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents:
42660
diff
changeset
|
3611 ;; If we did not move down as far as desired, |
b9928a414b19
(line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents:
42660
diff
changeset
|
3612 ;; at least go to end of line. |
b9928a414b19
(line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents:
42660
diff
changeset
|
3613 (end-of-line)) |
b9928a414b19
(line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents:
42660
diff
changeset
|
3614 ((< arg 0) |
64598
e139156061a7
(line-move-1): Fix comments.
Juri Linkov <juri@jurta.org>
parents:
64548
diff
changeset
|
3615 ;; 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
|
3616 ;; at least go to beginning 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
|
3617 (beginning-of-line)) |
b9928a414b19
(line-move): If we can't move enough lines, go to beginning or end of line.
Richard M. Stallman <rms@gnu.org>
parents:
42660
diff
changeset
|
3618 (t |
58354
36916d006f6b
(line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents:
58046
diff
changeset
|
3619 (line-move-finish (or goal-column temporary-goal-column) |
36916d006f6b
(line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents:
58046
diff
changeset
|
3620 opoint forward)))))) |
36916d006f6b
(line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents:
58046
diff
changeset
|
3621 |
36916d006f6b
(line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents:
58046
diff
changeset
|
3622 (defun line-move-finish (column opoint forward) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3623 (let ((repeat t)) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3624 (while repeat |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3625 ;; 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
|
3626 (setq repeat nil) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3627 |
44756
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
3628 (let (new |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3629 (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
|
3630 (line-end |
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
3631 ;; Compute the end of the line |
58354
36916d006f6b
(line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents:
58046
diff
changeset
|
3632 ;; ignoring effectively invisible newlines. |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3633 (save-excursion |
66346
37f27a66c519
(line-move-finish): Ignore fields computing LINE-END.
Richard M. Stallman <rms@gnu.org>
parents:
66281
diff
changeset
|
3634 ;; 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
|
3635 (skip-chars-forward "^\n") |
58354
36916d006f6b
(line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents:
58046
diff
changeset
|
3636 (while (and (not (eobp)) (line-move-invisible-p (point))) |
36916d006f6b
(line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents:
58046
diff
changeset
|
3637 (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
|
3638 (skip-chars-forward "^\n")) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3639 (point)))) |
44756
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
3640 |
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
3641 ;; Move to the desired column. |
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
3642 (line-move-to-column column) |
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
3643 (setq new (point)) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3644 |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3645 ;; Process intangibility within a line. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3646 ;; Move to the chosen destination position from above, |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3647 ;; with intangibility processing enabled. |
70623
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
3648 |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
3649 ;; Avoid calling point-entered and point-left. |
70620
b23be18ae943
* simple.el (line-move-finish): Don't call point motion hooks
Chong Yidong <cyd@stupidchicken.com>
parents:
70590
diff
changeset
|
3650 (goto-char new) |
70623
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
3651 (let ((inhibit-point-motion-hooks nil)) |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
3652 (goto-char new) |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
3653 |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
3654 ;; 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
|
3655 ;; 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
|
3656 (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
|
3657 (setq new (point)) |
70623
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
3658 ;; If that position is "too late", |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
3659 ;; try the previous allowable position. |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
3660 ;; See if it is ok. |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
3661 (backward-char) |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
3662 (if (if forward |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
3663 ;; 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
|
3664 ;; 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
|
3665 (< line-beg (point)) |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
3666 ;; 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
|
3667 ;; 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
|
3668 (<= (point) line-end)) |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
3669 (setq new (point)) |
2ed5d4bbedbf
* simple.el (line-move-finish): Fix last fix.
Chong Yidong <cyd@stupidchicken.com>
parents:
70620
diff
changeset
|
3670 ;; 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
|
3671 (setq new line-end)))) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3672 |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3673 ;; Now move to the updated destination, processing fields |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3674 ;; as well as intangibility. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3675 (goto-char opoint) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3676 (let ((inhibit-point-motion-hooks nil)) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3677 (goto-char |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3678 (constrain-to-field new opoint nil t |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3679 'inhibit-line-move-field-capture))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3680 |
44756
56b4ca0725c1
(line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents:
44667
diff
changeset
|
3681 ;; 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
|
3682 ;; retry everything within that new line. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3683 (when (or (< (point) line-beg) (> (point) line-end)) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3684 ;; Repeat the intangibility and field processing. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3685 (setq repeat t)))))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3686 |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3687 (defun line-move-to-column (col) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3688 "Try to find column COL, considering invisibility. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3689 This function works only in certain cases, |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3690 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
|
3691 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
|
3692 (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
|
3693 (beginning-of-line) |
7213f46c80a0
(line-move-to-column): Don't call move-to-column if COL=0.
Richard M. Stallman <rms@gnu.org>
parents:
44152
diff
changeset
|
3694 (move-to-column col)) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3695 |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3696 (when (and line-move-ignore-invisible |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3697 (not (bolp)) (line-move-invisible-p (1- (point)))) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3698 (let ((normal-location (point)) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3699 (normal-column (current-column))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3700 ;; If the following character is currently invisible, |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3701 ;; 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
|
3702 (while (and (not (eobp)) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3703 (line-move-invisible-p (point))) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3704 (goto-char (next-char-property-change (point)))) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3705 ;; Have we advanced to a larger column position? |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3706 (if (> (current-column) normal-column) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3707 ;; 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
|
3708 ;; See if we can make any further progress. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3709 (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
|
3710 ;; Otherwise, go to the place we originally found |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3711 ;; and move back over invisible text. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3712 ;; 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
|
3713 ;; but with a more reasonable buffer position. |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3714 (goto-char normal-location) |
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3715 (let ((line-beg (save-excursion (beginning-of-line) (point)))) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3716 (while (and (not (bolp)) (line-move-invisible-p (1- (point)))) |
42366
8c5f3e3e60da
(line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents:
42170
diff
changeset
|
3717 (goto-char (previous-char-property-change (point) line-beg)))))))) |
475 | 3718 |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3719 (defun move-end-of-line (arg) |
68042 | 3720 "Move point to end of current line as displayed. |
3721 \(If there's an image in the line, this disregards newlines | |
3722 which are part of the text that the image rests on.) | |
3723 | |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3724 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
|
3725 If point reaches the beginning or end of buffer, it stops there. |
68042 | 3726 To ignore intangibility, bind `inhibit-point-motion-hooks' to t." |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3727 (interactive "p") |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3728 (or arg (setq arg 1)) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3729 (let (done) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3730 (while (not done) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3731 (let ((newpos |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3732 (save-excursion |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3733 (let ((goal-column 0)) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3734 (and (line-move arg t) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3735 (not (bobp)) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3736 (progn |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3737 (while (and (not (bobp)) (line-move-invisible-p (1- (point)))) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3738 (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
|
3739 (backward-char 1))) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3740 (point))))) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3741 (goto-char newpos) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3742 (if (and (> (point) newpos) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3743 (eq (preceding-char) ?\n)) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3744 (backward-char 1) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3745 (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
|
3746 (not (eq (following-char) ?\n))) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3747 ;; If we skipped something intangible |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3748 ;; and now we're not really at eol, |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3749 ;; keep going. |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3750 (setq arg 1) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3751 (setq done t))))))) |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3752 |
60486
47a57ff1da21
(move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents:
60463
diff
changeset
|
3753 (defun move-beginning-of-line (arg) |
68042 | 3754 "Move point to beginning of current line as displayed. |
3755 \(If there's an image in the line, this disregards newlines | |
3756 which are part of the text that the image rests on.) | |
3757 | |
60486
47a57ff1da21
(move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents:
60463
diff
changeset
|
3758 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
|
3759 If point reaches the beginning or end of buffer, it stops there. |
68042 | 3760 To ignore intangibility, bind `inhibit-point-motion-hooks' to t." |
60486
47a57ff1da21
(move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents:
60463
diff
changeset
|
3761 (interactive "p") |
47a57ff1da21
(move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents:
60463
diff
changeset
|
3762 (or arg (setq arg 1)) |
69899
6626190949c3
(filter-buffer-substring): Add NOPROPS arg, so
Kim F. Storm <storm@cua.dk>
parents:
69852
diff
changeset
|
3763 |
60619
e51f0754a4c4
(move-beginning-of-line): Use vertical-motion.
Kim F. Storm <storm@cua.dk>
parents:
60609
diff
changeset
|
3764 (let ((orig (point))) |
68403
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
3765 |
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
3766 ;; 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
|
3767 (if (/= arg 1) |
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
3768 (line-move (1- arg) t)) |
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
3769 |
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
3770 ;; 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
|
3771 (skip-chars-backward "^\n") |
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
3772 (while (and (not (bobp)) (line-move-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
|
3773 (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
|
3774 (skip-chars-backward "^\n")) |
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
3775 |
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
3776 ;; Take care of fields. |
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
3777 (goto-char (constrain-to-field (point) orig |
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
3778 (/= arg 1) t nil)))) |
60486
47a57ff1da21
(move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents:
60463
diff
changeset
|
3779 |
47a57ff1da21
(move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents:
60463
diff
changeset
|
3780 |
1771
3f0f18d4eb8c
* simple.el (set-goal-column): Make this command disabled by default.
Jim Blandy <jimb@redhat.com>
parents:
1760
diff
changeset
|
3781 ;;; Many people have said they rarely use this feature, and often type |
3f0f18d4eb8c
* simple.el (set-goal-column): Make this command disabled by default.
Jim Blandy <jimb@redhat.com>
parents:
1760
diff
changeset
|
3782 ;;; it by accident. Maybe it shouldn't even be on a key. |
3f0f18d4eb8c
* simple.el (set-goal-column): Make this command disabled by default.
Jim Blandy <jimb@redhat.com>
parents:
1760
diff
changeset
|
3783 (put 'set-goal-column 'disabled t) |
475 | 3784 |
3785 (defun set-goal-column (arg) | |
3786 "Set the current horizontal position as a goal for \\[next-line] and \\[previous-line]. | |
3787 Those commands will move to this position in the line moved to | |
3788 rather than trying to keep the same horizontal position. | |
3789 With a non-nil argument, clears out the goal column | |
1466
04b4499061fd
(goal-column): Don't put the defvar inside the make-variable-buffer-local.
Richard M. Stallman <rms@gnu.org>
parents:
1459
diff
changeset
|
3790 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
|
3791 The goal column is stored in the variable `goal-column'." |
475 | 3792 (interactive "P") |
3793 (if arg | |
3794 (progn | |
3795 (setq goal-column nil) | |
3796 (message "No goal column")) | |
3797 (setq goal-column (current-column)) | |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
3798 ;; 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
|
3799 ;; to a sequence containing % |
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
3800 ;;(message (substitute-command-keys |
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
3801 ;;"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
|
3802 ;;goal-column) |
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
3803 (message "%s" |
66823
e0104334e066
(what-cursor-position): Print (EOB) instead of (100%)
Kim F. Storm <storm@cua.dk>
parents:
66671
diff
changeset
|
3804 (concat |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
3805 (format "Goal column %d " goal-column) |
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
3806 (substitute-command-keys |
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
3807 "(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
|
3808 |
65582
4d1085b02d64
Message format spec fixes (1)
Deepak Goel <deego@gnufans.org>
parents:
65521
diff
changeset
|
3809 ) |
475 | 3810 nil) |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
3811 |
8006
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
3812 |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
3813 (defun scroll-other-window-down (lines) |
12718
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
3814 "Scroll the \"other window\" down. |
0a8b4f086ffc
(do-auto-fill): Handle adaptive-fill-function and adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12708
diff
changeset
|
3815 For more details, see the documentation for `scroll-other-window'." |
8006
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
3816 (interactive "P") |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
3817 (scroll-other-window |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
3818 ;; Just invert the argument's meaning. |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
3819 ;; We can do that without knowing which window it will be. |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
3820 (if (eq lines '-) nil |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
3821 (if (null lines) '- |
6e58b282df42
(scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents:
7881
diff
changeset
|
3822 (- (prefix-numeric-value lines)))))) |
8057
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3823 |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3824 (defun beginning-of-buffer-other-window (arg) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3825 "Move point to the beginning of the buffer in the other window. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3826 Leave mark at previous position. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3827 With arg N, put point N/10 of the way from the true beginning." |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3828 (interactive "P") |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3829 (let ((orig-window (selected-window)) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3830 (window (other-window-for-scrolling))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3831 ;; We use unwind-protect rather than save-window-excursion |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3832 ;; because the latter would preserve the things we want to change. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3833 (unwind-protect |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3834 (progn |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3835 (select-window window) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3836 ;; Set point and mark in that window's buffer. |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3837 (with-no-warnings |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3838 (beginning-of-buffer arg)) |
8057
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3839 ;; Set point accordingly. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3840 (recenter '(t))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3841 (select-window orig-window)))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3842 |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3843 (defun end-of-buffer-other-window (arg) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3844 "Move point to the end of the buffer in the other window. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3845 Leave mark at previous position. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3846 With arg N, put point N/10 of the way from the true end." |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3847 (interactive "P") |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3848 ;; See beginning-of-buffer-other-window for comments. |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3849 (let ((orig-window (selected-window)) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3850 (window (other-window-for-scrolling))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3851 (unwind-protect |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3852 (progn |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3853 (select-window window) |
58046
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3854 (with-no-warnings |
e24a83048e7b
(next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents:
57853
diff
changeset
|
3855 (end-of-buffer arg)) |
8057
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3856 (recenter '(t))) |
11a0c2f22d7e
(beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents:
8006
diff
changeset
|
3857 (select-window orig-window)))) |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
3858 |
475 | 3859 (defun transpose-chars (arg) |
3860 "Interchange characters around point, moving forward one character. | |
3861 With prefix arg ARG, effect is to take character before point | |
3862 and drag it forward past ARG other characters (backward if ARG negative). | |
3863 If no argument and at end of line, the previous two chars are exchanged." | |
3864 (interactive "*P") | |
3865 (and (null arg) (eolp) (forward-char -1)) | |
3866 (transpose-subr 'forward-char (prefix-numeric-value arg))) | |
3867 | |
3868 (defun transpose-words (arg) | |
3869 "Interchange words around point, leaving point at end of them. | |
3870 With prefix arg ARG, effect is to take word before or around point | |
3871 and drag it forward past ARG other words (backward if ARG negative). | |
3872 If ARG is zero, the words around or after point and around or after mark | |
3873 are interchanged." | |
44505
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3874 ;; FIXME: `foo a!nd bar' should transpose into `bar and foo'. |
475 | 3875 (interactive "*p") |
3876 (transpose-subr 'forward-word arg)) | |
3877 | |
3878 (defun transpose-sexps (arg) | |
3879 "Like \\[transpose-words] but applies to sexps. | |
3880 Does not work on a sexp that point is in the middle of | |
3881 if it is a list or string." | |
3882 (interactive "*p") | |
44505
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3883 (transpose-subr |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3884 (lambda (arg) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3885 ;; 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
|
3886 ;; (cons (progn (forward-sexp x) (point)) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3887 ;; (progn (forward-sexp (- x)) (point))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3888 ;; 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
|
3889 ;; 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
|
3890 ;; 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
|
3891 (if (if (> arg 0) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3892 (looking-at "\\sw\\|\\s_") |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3893 (and (not (bobp)) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3894 (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
|
3895 ;; 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
|
3896 (progn (funcall (if (> arg 0) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3897 'skip-syntax-backward 'skip-syntax-forward) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3898 "w_") |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3899 (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
|
3900 ;; 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
|
3901 ;; 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
|
3902 ;; we're going. |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3903 (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
|
3904 (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
|
3905 (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
|
3906 (not (zerop (funcall (if (> arg 0) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3907 'skip-syntax-forward |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3908 'skip-syntax-backward) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3909 "."))))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3910 (point))))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
3911 arg 'special)) |
475 | 3912 |
3913 (defun transpose-lines (arg) | |
3914 "Exchange current line and previous line, leaving point after both. | |
3915 With argument ARG, takes previous line and moves it past ARG lines. | |
3916 With argument 0, interchanges line point is in with line mark is in." | |
3917 (interactive "*p") | |
3918 (transpose-subr (function | |
3919 (lambda (arg) | |
20465
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
3920 (if (> arg 0) |
475 | 3921 (progn |
20465
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
3922 ;; Move forward over ARG lines, |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
3923 ;; but create newlines if necessary. |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
3924 (setq arg (forward-line arg)) |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
3925 (if (/= (preceding-char) ?\n) |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
3926 (setq arg (1+ arg))) |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
3927 (if (> arg 0) |
de641c2459a6
(transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents:
20384
diff
changeset
|
3928 (newline arg))) |
475 | 3929 (forward-line arg)))) |
3930 arg)) | |
3931 | |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3932 (defun transpose-subr (mover arg &optional special) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3933 (let ((aux (if special mover |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3934 (lambda (x) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3935 (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
|
3936 (progn (funcall mover (- x)) (point)))))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3937 pos1 pos2) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3938 (cond |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3939 ((= arg 0) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3940 (save-excursion |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3941 (setq pos1 (funcall aux 1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3942 (goto-char (mark)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3943 (setq pos2 (funcall aux 1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3944 (transpose-subr-1 pos1 pos2)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3945 (exchange-point-and-mark)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3946 ((> arg 0) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3947 (setq pos1 (funcall aux -1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3948 (setq pos2 (funcall aux arg)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3949 (transpose-subr-1 pos1 pos2) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3950 (goto-char (car pos2))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3951 (t |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3952 (setq pos1 (funcall aux -1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3953 (goto-char (car pos1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3954 (setq pos2 (funcall aux arg)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3955 (transpose-subr-1 pos1 pos2))))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3956 |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3957 (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
|
3958 (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
|
3959 (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
|
3960 (when (> (car pos1) (car pos2)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3961 (let ((swap pos1)) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3962 (setq pos1 pos2 pos2 swap))) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
3963 (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
|
3964 (atomic-change-group |
49ff3106980b
(undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
43032
diff
changeset
|
3965 (let (word2) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
3966 ;; 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
|
3967 ;; 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
|
3968 (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
|
3969 (goto-char (car pos2)) |
49ff3106980b
(undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
43032
diff
changeset
|
3970 (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
|
3971 (goto-char (car pos1)) |
49ff3106980b
(undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents:
43032
diff
changeset
|
3972 (insert word2)))) |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
3973 |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
3974 (defun backward-word (&optional arg) |
39110 | 3975 "Move backward until encountering the beginning of a word. |
32222 | 3976 With argument, do this that many times." |
5764
5726c18895e3
Rms (in his change to comment-region on Feb 1) decided to make
Michael I. Bushnell <mib@gnu.org>
parents:
5730
diff
changeset
|
3977 (interactive "p") |
52205
2f18cefc2997
(eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents:
52046
diff
changeset
|
3978 (forward-word (- (or arg 1)))) |
475 | 3979 |
59178
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
3980 (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
|
3981 "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
|
3982 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
|
3983 move to with the same argument. |
59178
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
3984 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
|
3985 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
|
3986 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
|
3987 (interactive "P\np") |
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
3988 (cond ((and allow-extend |
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
3989 (or (and (eq last-command this-command) (mark t)) |
abe8f4f2982c
(mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents:
59162
diff
changeset
|
3990 (and transient-mark-mode mark-active))) |
58917
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
3991 (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
|
3992 (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
|
3993 (set-mark |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
3994 (save-excursion |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
3995 (goto-char (mark)) |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
3996 (forward-word arg) |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
3997 (point)))) |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
3998 (t |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
3999 (push-mark |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
4000 (save-excursion |
58917
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
4001 (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
|
4002 (point)) |
898b4b31410f
* lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
43125
diff
changeset
|
4003 nil t)))) |
475 | 4004 |
4005 (defun kill-word (arg) | |
4006 "Kill characters forward until encountering the end of a word. | |
4007 With argument, do this that many times." | |
27836
132294fa754e
(zap-to-char, kill-line, kill-region, kill-word)
Dave Love <fx@gnu.org>
parents:
27477
diff
changeset
|
4008 (interactive "p") |
25400
c75839c09c84
(kill-word): Undo previous change.
Gerd Moellmann <gerd@gnu.org>
parents:
25342
diff
changeset
|
4009 (kill-region (point) (progn (forward-word arg) (point)))) |
475 | 4010 |
4011 (defun backward-kill-word (arg) | |
4012 "Kill characters backward until encountering the end of a word. | |
4013 With argument, do this that many times." | |
27836
132294fa754e
(zap-to-char, kill-line, kill-region, kill-word)
Dave Love <fx@gnu.org>
parents:
27477
diff
changeset
|
4014 (interactive "p") |
475 | 4015 (kill-word (- arg))) |
2416
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
4016 |
51802
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4017 (defun current-word (&optional strict really-word) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4018 "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
|
4019 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
|
4020 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
|
4021 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
|
4022 if there is no word nearby. |
51802
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4023 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
|
4024 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
|
4025 (save-excursion |
51802
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4026 (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
|
4027 (syntaxes (if really-word "w" "w_")) |
51802
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4028 (not-syntaxes (concat "^" syntaxes))) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4029 (skip-syntax-backward syntaxes) (setq start (point)) |
2416
cd01176e9dc5
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2315
diff
changeset
|
4030 (goto-char oldpoint) |
51802
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4031 (skip-syntax-forward syntaxes) (setq end (point)) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4032 (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
|
4033 ;; 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
|
4034 (not strict)) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4035 ;; Look for preceding word in same line. |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4036 (skip-syntax-backward not-syntaxes |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4037 (save-excursion (beginning-of-line) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4038 (point))) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4039 (if (bolp) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4040 ;; No preceding word in same line. |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4041 ;; Look for following word in same line. |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4042 (progn |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4043 (skip-syntax-forward not-syntaxes |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4044 (save-excursion (end-of-line) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4045 (point))) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4046 (setq start (point)) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4047 (skip-syntax-forward syntaxes) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4048 (setq end (point))) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4049 (setq end (point)) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4050 (skip-syntax-backward syntaxes) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4051 (setq start (point)))) |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
4052 ;; 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
|
4053 (unless (= start end) |
18379
1dd6f63f0ea3
(paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18334
diff
changeset
|
4054 (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
|
4055 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4056 (defcustom fill-prefix nil |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4057 "*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
|
4058 :type '(choice (const :tag "None" nil) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4059 string) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4060 :group 'fill) |
475 | 4061 (make-variable-buffer-local 'fill-prefix) |
70590
63b772bfba93
Move `safe-local-variable' declarations to the respective files.
Reiner Steib <Reiner.Steib@gmx.de>
parents:
70488
diff
changeset
|
4062 ;;;###autoload(put 'fill-prefix 'safe-local-variable 'string-or-null-p) |
475 | 4063 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4064 (defcustom auto-fill-inhibit-regexp nil |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4065 "*Regexp to match lines which should not be auto-filled." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4066 :type '(choice (const :tag "None" nil) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4067 regexp) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4068 :group 'fill) |
475 | 4069 |
33781
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
4070 (defvar comment-line-break-function 'comment-indent-new-line |
19160
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
4071 "*Mode-specific function which line breaks and continues a comment. |
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
4072 |
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
4073 This function is only called during auto-filling of a comment section. |
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
4074 The function should take a single optional argument, which is a flag |
63595
5f8cc0ba19ce
(comment-line-break-function): Doc fix: don't say variable is automatically
Juanma Barranquero <lekktu@gmail.com>
parents:
63592
diff
changeset
|
4075 indicating whether it should use soft newlines.") |
19160
6fc804ec9434
(comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
19109
diff
changeset
|
4076 |
21122
912cc3491589
(do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents:
21074
diff
changeset
|
4077 ;; 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
|
4078 ;; 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
|
4079 ;; 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
|
4080 ;; (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
|
4081 ;; but this one is the default one.) |
475 | 4082 (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
|
4083 (let (fc justify give-up |
12708
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
4084 (fill-prefix fill-prefix)) |
10471
3eb77f03f53e
(do-auto-fill): justification renamed to current-justification.
Richard M. Stallman <rms@gnu.org>
parents:
10469
diff
changeset
|
4085 (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
|
4086 (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
|
4087 (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
|
4088 (<= (current-column) fc)) |
55699
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4089 (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
|
4090 (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
|
4091 (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
|
4092 nil ;; Auto-filling not required |
10813
bccf0295c66e
(open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents:
10805
diff
changeset
|
4093 (if (memq justify '(full center right)) |
bccf0295c66e
(open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents:
10805
diff
changeset
|
4094 (save-excursion (unjustify-current-line))) |
12708
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
4095 |
1a81e79198c6
(do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
12624
diff
changeset
|
4096 ;; 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
|
4097 (when (and adaptive-fill-mode |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4098 (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
|
4099 (let ((prefix |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4100 (fill-context-prefix |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4101 (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
|
4102 (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
|
4103 (and prefix (not (equal prefix "")) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4104 ;; 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
|
4105 (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
|
4106 (string-match "\\`[ \t]*\\'" prefix))) |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4107 (setq fill-prefix prefix)))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49585
diff
changeset
|
4108 |
10469
2546bad34200
(do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents:
10422
diff
changeset
|
4109 (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
|
4110 ;; 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
|
4111 (let* (after-prefix |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
4112 (fill-point |
55699
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4113 (save-excursion |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4114 (beginning-of-line) |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4115 (setq after-prefix (point)) |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4116 (and fill-prefix |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4117 (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
|
4118 (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
|
4119 (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
|
4120 (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
|
4121 (point)))) |
19343
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
4122 |
9427b0fcd9c1
(do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents:
19326
diff
changeset
|
4123 ;; 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
|
4124 (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
|
4125 (goto-char fill-point) |
44505
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4126 (or (bolp) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4127 ;; 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
|
4128 (save-excursion (skip-chars-forward " ") (eolp)) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4129 ;; 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
|
4130 ;; 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
|
4131 (and after-prefix (<= (point) after-prefix)) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4132 ;; 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
|
4133 ;; 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
|
4134 (and comment-start-skip |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4135 (let ((limit (point))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4136 (beginning-of-line) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4137 (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
|
4138 limit t) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4139 (eq (point) limit)))))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4140 ;; 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
|
4141 (setq give-up t) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4142 ;; 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
|
4143 (let ((prev-column (current-column))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4144 ;; 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
|
4145 ;; 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
|
4146 ;; 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
|
4147 (if (save-excursion |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4148 (skip-chars-backward " \t") |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4149 (= (point) fill-point)) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4150 (funcall comment-line-break-function t) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4151 (save-excursion |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4152 (goto-char fill-point) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4153 (funcall comment-line-break-function t))) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4154 ;; Now do justification, if required |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4155 (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
|
4156 (save-excursion |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4157 (end-of-line 0) |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4158 (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
|
4159 ;; 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
|
4160 ;; 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
|
4161 ;; trying again will not help. |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4162 (if (>= (current-column) prev-column) |
76f93b741944
(line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44423
diff
changeset
|
4163 (setq give-up t)))))) |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
4164 ;; Justify last line. |
15263
0d7899c372ed
(do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents:
15115
diff
changeset
|
4165 (justify-current-line justify t t) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
4166 t))) |
475 | 4167 |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
4168 (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
|
4169 "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
|
4170 Some major modes set this.") |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
4171 |
60645
b532848a1806
(auto-fill-function): Use the new :minor-mode-function property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60619
diff
changeset
|
4172 (put 'auto-fill-function :minor-mode-function 'auto-fill-mode) |
47346
8287dca5eb2d
(what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47316
diff
changeset
|
4173 ;; 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
|
4174 ;; Add a global minor mode version of it. |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
4175 (defun auto-fill-mode (&optional arg) |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
4176 "Toggle Auto Fill mode. |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
4177 With arg, turn Auto Fill mode on if and only if arg is positive. |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
4178 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
|
4179 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
|
4180 |
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
4181 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
|
4182 for `auto-fill-function' when turning Auto Fill mode on." |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
4183 (interactive "P") |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
4184 (prog1 (setq auto-fill-function |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
4185 (if (if (null arg) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
4186 (not auto-fill-function) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
4187 (> (prefix-numeric-value arg) 0)) |
15836
aa83fbda6971
(normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15605
diff
changeset
|
4188 normal-auto-fill-function |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
4189 nil)) |
11572
09d49f6e0af9
(auto-fill-mode): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents:
11479
diff
changeset
|
4190 (force-mode-line-update))) |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
4191 |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
4192 ;; 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
|
4193 (defun auto-fill-function () |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
4194 "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
|
4195 nil) |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
4196 |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
4197 (defun turn-on-auto-fill () |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
4198 "Unconditionally turn on Auto Fill mode." |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
4199 (auto-fill-mode 1)) |
29808
fa2c8534a53a
(turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29345
diff
changeset
|
4200 |
fa2c8534a53a
(turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29345
diff
changeset
|
4201 (defun turn-off-auto-fill () |
fa2c8534a53a
(turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29345
diff
changeset
|
4202 "Unconditionally turn off Auto Fill mode." |
fa2c8534a53a
(turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29345
diff
changeset
|
4203 (auto-fill-mode -1)) |
fa2c8534a53a
(turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
29345
diff
changeset
|
4204 |
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
|
4205 (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
|
4206 |
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
4207 (defun set-fill-column (arg) |
15431
68cca71d69bd
(set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents:
15305
diff
changeset
|
4208 "Set `fill-column' to specified argument. |
23447
7ccd43d053fd
(set-fill-column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
23251
diff
changeset
|
4209 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
|
4210 Just \\[universal-argument] as argument means to use the current column." |
6907
35e524a24c7f
(auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents:
6837
diff
changeset
|
4211 (interactive "P") |
17874
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
4212 (if (consp arg) |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
4213 (setq arg (current-column))) |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
4214 (if (not (integerp arg)) |
86e95716af6d
(set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents:
17855
diff
changeset
|
4215 ;; 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
|
4216 (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
|
4217 (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
|
4218 (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
|
4219 |
475 | 4220 (defun set-selective-display (arg) |
1027
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
4221 "Set `selective-display' to ARG; clear it if no arg. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
4222 When the value of `selective-display' is a number > 0, |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
4223 lines whose indentation is >= that value are not displayed. |
f0000f6f7942
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
954
diff
changeset
|
4224 The variable `selective-display' has a separate value for each buffer." |
475 | 4225 (interactive "P") |
4226 (if (eq selective-display t) | |
4227 (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
|
4228 (let ((current-vpos |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
4229 (save-restriction |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
4230 (narrow-to-region (point-min) (point)) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
4231 (goto-char (window-start)) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
4232 (vertical-motion (window-height))))) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
4233 (setq selective-display |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
4234 (and arg (prefix-numeric-value arg))) |
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
4235 (recenter current-vpos)) |
475 | 4236 (set-window-start (selected-window) (window-start (selected-window))) |
4237 (princ "selective-display set to " t) | |
4238 (prin1 selective-display t) | |
4239 (princ "." t)) | |
4240 | |
48406
e670dd0e8087
(indicate-unused-lines, default-indicate-unused-lines): New variable aliases.
Richard M. Stallman <rms@gnu.org>
parents:
48234
diff
changeset
|
4241 (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
|
4242 (defvaralias 'default-indicate-unused-lines 'default-indicate-empty-lines) |
e670dd0e8087
(indicate-unused-lines, default-indicate-unused-lines): New variable aliases.
Richard M. Stallman <rms@gnu.org>
parents:
48234
diff
changeset
|
4243 |
46175
9fa0c9140afa
2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
46092
diff
changeset
|
4244 (defun toggle-truncate-lines (arg) |
9fa0c9140afa
2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
46092
diff
changeset
|
4245 "Toggle whether to fold or truncate long lines on the screen. |
46872
543ab39f153c
(toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents:
46845
diff
changeset
|
4246 With arg, truncate long lines iff arg is positive. |
543ab39f153c
(toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents:
46845
diff
changeset
|
4247 Note that in side-by-side windows, truncation is always enabled." |
46175
9fa0c9140afa
2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
46092
diff
changeset
|
4248 (interactive "P") |
9fa0c9140afa
2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
46092
diff
changeset
|
4249 (setq truncate-lines |
9fa0c9140afa
2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
46092
diff
changeset
|
4250 (if (null arg) |
9fa0c9140afa
2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents:
46092
diff
changeset
|
4251 (not truncate-lines) |
46872
543ab39f153c
(toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents:
46845
diff
changeset
|
4252 (> (prefix-numeric-value arg) 0))) |
543ab39f153c
(toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents:
46845
diff
changeset
|
4253 (force-mode-line-update) |
48013
d3416b0f856c
(toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents:
47599
diff
changeset
|
4254 (unless truncate-lines |
d3416b0f856c
(toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents:
47599
diff
changeset
|
4255 (let ((buffer (current-buffer))) |
d3416b0f856c
(toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents:
47599
diff
changeset
|
4256 (walk-windows (lambda (window) |
d3416b0f856c
(toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents:
47599
diff
changeset
|
4257 (if (eq buffer (window-buffer window)) |
d3416b0f856c
(toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents:
47599
diff
changeset
|
4258 (set-window-hscroll window 0))) |
d3416b0f856c
(toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents:
47599
diff
changeset
|
4259 nil t))) |
46872
543ab39f153c
(toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents:
46845
diff
changeset
|
4260 (message "Truncate long lines %s" |
543ab39f153c
(toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents:
46845
diff
changeset
|
4261 (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
|
4262 |
17471
f383bfae3202
(overwrite-mode-binary, overwrite-mode-textual): Use defvar.
Richard M. Stallman <rms@gnu.org>
parents:
17355
diff
changeset
|
4263 (defvar overwrite-mode-textual " Ovwrt" |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4264 "The string displayed in the mode line when in overwrite mode.") |
17471
f383bfae3202
(overwrite-mode-binary, overwrite-mode-textual): Use defvar.
Richard M. Stallman <rms@gnu.org>
parents:
17355
diff
changeset
|
4265 (defvar overwrite-mode-binary " Bin Ovwrt" |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4266 "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
|
4267 |
475 | 4268 (defun overwrite-mode (arg) |
4269 "Toggle overwrite mode. | |
4270 With arg, turn overwrite mode on iff arg is positive. | |
4271 In overwrite mode, printing characters typed in replace existing text | |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4272 on a one-for-one basis, rather than pushing it to the right. At the |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4273 end of a line, such characters extend the line. Before a tab, |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4274 such characters insert until the tab is filled in. |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4275 \\[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
|
4276 is supposed to make it easier to insert characters when necessary." |
475 | 4277 (interactive "P") |
4278 (setq overwrite-mode | |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4279 (if (if (null arg) (not overwrite-mode) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4280 (> (prefix-numeric-value arg) 0)) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4281 'overwrite-mode-textual)) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4282 (force-mode-line-update)) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4283 |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4284 (defun binary-overwrite-mode (arg) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4285 "Toggle binary overwrite mode. |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4286 With arg, turn binary overwrite mode on iff arg is positive. |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4287 In binary overwrite mode, printing characters typed in replace |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4288 existing text. Newlines are not treated specially, so typing at the |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4289 end of a line joins the line to the next, with the typed character |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4290 between them. Typing before a tab character simply replaces the tab |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4291 with the character typed. |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4292 \\[quoted-insert] replaces the text at the cursor, just as ordinary |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4293 typing characters do. |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4294 |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4295 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
|
4296 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
|
4297 `overwrite-mode' variable to `overwrite-mode-binary'." |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4298 (interactive "P") |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4299 (setq overwrite-mode |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4300 (if (if (null arg) |
2301
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
4301 (not (eq overwrite-mode 'overwrite-mode-binary)) |
2215
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4302 (> (prefix-numeric-value arg) 0)) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4303 'overwrite-mode-binary)) |
a7d915ce7676
src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents:
2111
diff
changeset
|
4304 (force-mode-line-update)) |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
33781
diff
changeset
|
4305 |
47408
2239db3433ca
(transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47364
diff
changeset
|
4306 (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
|
4307 "Toggle Line Number mode. |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
4308 With arg, turn Line Number mode on iff arg is positive. |
1380ea427dee
(line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents:
2299
diff
changeset
|
4309 When Line Number mode is enabled, the line number appears |
23660 | 4310 in the mode line. |
4311 | |
38908
f917490db0d6
(line-number-mode): Mention the variable line-number-display-limit-width
Eli Zaretskii <eliz@gnu.org>
parents:
38847
diff
changeset
|
4312 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
|
4313 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
|
4314 and `line-number-display-limit-width'." |
67243
4f8e0edba613
(transient-mark-mode, line-number-mode)
Luc Teirlinck <teirllm@auburn.edu>
parents:
67213
diff
changeset
|
4315 :init-value t :global t :group 'editing-basics) |
47408
2239db3433ca
(transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47364
diff
changeset
|
4316 |
2239db3433ca
(transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47364
diff
changeset
|
4317 (define-minor-mode column-number-mode |
12565
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
4318 "Toggle Column Number mode. |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
4319 With arg, turn Column Number mode on iff arg is positive. |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
4320 When Column Number mode is enabled, the column number appears |
c0a5d0d00c18
(shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents:
12483
diff
changeset
|
4321 in the mode line." |
67243
4f8e0edba613
(transient-mark-mode, line-number-mode)
Luc Teirlinck <teirllm@auburn.edu>
parents:
67213
diff
changeset
|
4322 :global t :group 'editing-basics) |
52464 | 4323 |
4324 (define-minor-mode size-indication-mode | |
4325 "Toggle Size Indication mode. | |
4326 With arg, turn Size Indication mode on iff arg is positive. When | |
4327 Size Indication mode is enabled, the size of the accessible part | |
4328 of the buffer appears in the mode line." | |
67243
4f8e0edba613
(transient-mark-mode, line-number-mode)
Luc Teirlinck <teirllm@auburn.edu>
parents:
67213
diff
changeset
|
4329 :global t :group 'editing-basics) |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
4330 |
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
|
4331 (defgroup paren-blinking nil |
18379
1dd6f63f0ea3
(paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
18334
diff
changeset
|
4332 "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
|
4333 :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
|
4334 :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
|
4335 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4336 (defcustom blink-matching-paren t |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4337 "*Non-nil means show matching open-paren when close-paren is inserted." |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4338 :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
|
4339 :group 'paren-blinking) |
475 | 4340 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4341 (defcustom blink-matching-paren-on-screen t |
13810
64679d67fde9
(blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents:
13587
diff
changeset
|
4342 "*Non-nil means show matching open-paren when it is on screen. |
18334
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
4343 If nil, means 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
|
4344 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
|
4345 |
67154
a90e7f4f4c45
(blink-matching-paren-on-screen): Further doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
67152
diff
changeset
|
4346 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
|
4347 \(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
|
4348 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
|
4349 :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
|
4350 :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
|
4351 |
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
4352 (defcustom blink-matching-paren-distance (* 25 1024) |
65173
9398f33d6515
(blink-matching-paren-distance): Document the meaning of nil value,
Eli Zaretskii <eliz@gnu.org>
parents:
64991
diff
changeset
|
4353 "*If non-nil, maximum distance to search backwards for matching open-paren. |
9398f33d6515
(blink-matching-paren-distance): Document the meaning of nil value,
Eli Zaretskii <eliz@gnu.org>
parents:
64991
diff
changeset
|
4354 If nil, search stops at the beginning of the accessible portion of the buffer." |
9398f33d6515
(blink-matching-paren-distance): Document the meaning of nil value,
Eli Zaretskii <eliz@gnu.org>
parents:
64991
diff
changeset
|
4355 :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
|
4356 :group 'paren-blinking) |
475 | 4357 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4358 (defcustom blink-matching-delay 1 |
18334
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
4359 "*Time in seconds to delay after showing a matching paren." |
d03c1b315e76
Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents:
18189
diff
changeset
|
4360 :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
|
4361 :group 'paren-blinking) |
9771
3a51735d4a55
(blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
9750
diff
changeset
|
4362 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4363 (defcustom blink-matching-paren-dont-ignore-comments nil |
68829
508732e39a9f
(blink-matching-paren-dont-ignore-comments): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68613
diff
changeset
|
4364 "*nil means `blink-matching-paren' ignores comments. |
508732e39a9f
(blink-matching-paren-dont-ignore-comments): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68613
diff
changeset
|
4365 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
|
4366 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
|
4367 :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
|
4368 :group 'paren-blinking) |
12893
3ae9326907aa
(blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents:
12838
diff
changeset
|
4369 |
475 | 4370 (defun blink-matching-open () |
4371 "Move cursor momentarily to the beginning of the sexp before point." | |
4372 (interactive) | |
65698
c2427cf9fc77
(blink-matching-open): Don't no-op when point is BEGV+1.
Richard M. Stallman <rms@gnu.org>
parents:
65582
diff
changeset
|
4373 (when (and (> (point) (point-min)) |
65377
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4374 blink-matching-paren |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4375 ;; Verify an even number of quoting characters precede the close. |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4376 (= 1 (logand 1 (- (point) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4377 (save-excursion |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4378 (forward-char -1) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4379 (skip-syntax-backward "/\\") |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4380 (point)))))) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4381 (let* ((oldpos (point)) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4382 blinkpos |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4383 message-log-max ; Don't log messages about paren matching. |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4384 matching-paren |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4385 open-paren-line-string) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4386 (save-excursion |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4387 (save-restriction |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4388 (if blink-matching-paren-distance |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4389 (narrow-to-region (max (point-min) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4390 (- (point) blink-matching-paren-distance)) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4391 oldpos)) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4392 (condition-case () |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4393 (let ((parse-sexp-ignore-comments |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4394 (and parse-sexp-ignore-comments |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4395 (not blink-matching-paren-dont-ignore-comments)))) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4396 (setq blinkpos (scan-sexps oldpos -1))) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4397 (error nil))) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4398 (and blinkpos |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4399 ;; Not syntax '$'. |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4400 (not (eq (syntax-class (syntax-after blinkpos)) 8)) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4401 (setq matching-paren |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4402 (let ((syntax (syntax-after blinkpos))) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4403 (and (consp syntax) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4404 (eq (syntax-class syntax) 4) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4405 (cdr syntax))))) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4406 (cond |
67053
ac8622e9be6d
(blink-matching-open): Allow new paren-class info.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67034
diff
changeset
|
4407 ((not (or (eq matching-paren (char-before oldpos)) |
ac8622e9be6d
(blink-matching-open): Allow new paren-class info.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67034
diff
changeset
|
4408 ;; The cdr might hold a new paren-class info rather than |
ac8622e9be6d
(blink-matching-open): Allow new paren-class info.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67034
diff
changeset
|
4409 ;; a matching-char info, in which case the two CDRs |
ac8622e9be6d
(blink-matching-open): Allow new paren-class info.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67034
diff
changeset
|
4410 ;; should match. |
67092
e2a1dbb7d8f3
(blink-matching-open): Fix off-by-one in last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67053
diff
changeset
|
4411 (eq matching-paren (cdr (syntax-after (1- oldpos)))))) |
65377
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4412 (message "Mismatched parentheses")) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4413 ((not blinkpos) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4414 (if (not blink-matching-paren-distance) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4415 (message "Unmatched parenthesis"))) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4416 ((pos-visible-in-window-p blinkpos) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4417 ;; Matching open within window, temporarily move to blinkpos but only |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4418 ;; if `blink-matching-paren-on-screen' is non-nil. |
67152
23ddbc106655
(blink-matching-open): Ignore `blink-matching-paren-on-screen' if
Luc Teirlinck <teirllm@auburn.edu>
parents:
67092
diff
changeset
|
4419 (and blink-matching-paren-on-screen |
23ddbc106655
(blink-matching-open): Ignore `blink-matching-paren-on-screen' if
Luc Teirlinck <teirllm@auburn.edu>
parents:
67092
diff
changeset
|
4420 (not show-paren-mode) |
23ddbc106655
(blink-matching-open): Ignore `blink-matching-paren-on-screen' if
Luc Teirlinck <teirllm@auburn.edu>
parents:
67092
diff
changeset
|
4421 (save-excursion |
23ddbc106655
(blink-matching-open): Ignore `blink-matching-paren-on-screen' if
Luc Teirlinck <teirllm@auburn.edu>
parents:
67092
diff
changeset
|
4422 (goto-char blinkpos) |
23ddbc106655
(blink-matching-open): Ignore `blink-matching-paren-on-screen' if
Luc Teirlinck <teirllm@auburn.edu>
parents:
67092
diff
changeset
|
4423 (sit-for blink-matching-delay)))) |
65377
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4424 (t |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4425 (save-excursion |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4426 (goto-char blinkpos) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4427 (setq open-paren-line-string |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4428 ;; Show what precedes the open in its line, if anything. |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4429 (if (save-excursion |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4430 (skip-chars-backward " \t") |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4431 (not (bolp))) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4432 (buffer-substring (line-beginning-position) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4433 (1+ blinkpos)) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4434 ;; Show what follows the open in its line, if anything. |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4435 (if (save-excursion |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4436 (forward-char 1) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4437 (skip-chars-forward " \t") |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4438 (not (eolp))) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4439 (buffer-substring blinkpos |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4440 (line-end-position)) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4441 ;; Otherwise show the previous nonblank line, |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4442 ;; if there is one. |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4443 (if (save-excursion |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4444 (skip-chars-backward "\n \t") |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4445 (not (bobp))) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4446 (concat |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4447 (buffer-substring (progn |
9434
d79ecfc2776c
(blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents:
9343
diff
changeset
|
4448 (skip-chars-backward "\n \t") |
65377
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4449 (line-beginning-position)) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4450 (progn (end-of-line) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4451 (skip-chars-backward " \t") |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4452 (point))) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4453 ;; Replace the newline and other whitespace with `...'. |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4454 "..." |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4455 (buffer-substring blinkpos (1+ blinkpos))) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4456 ;; There is nothing to show except the char itself. |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4457 (buffer-substring blinkpos (1+ blinkpos))))))) |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4458 (message "Matches %s" |
745b7454f9cc
(blink-matching-open): Get rid of text props from
Richard M. Stallman <rms@gnu.org>
parents:
65295
diff
changeset
|
4459 (substring-no-properties open-paren-line-string)))))))) |
475 | 4460 |
4461 ;Turned off because it makes dbx bomb out. | |
4462 (setq blink-paren-function 'blink-matching-open) | |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
4463 |
2805
5efa58250e35
(push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2796
diff
changeset
|
4464 ;; 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
|
4465 ;; 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
|
4466 ;; that happens in the QUIT macro at the C code level. |
475 | 4467 (defun keyboard-quit () |
22304 | 4468 "Signal a `quit' condition. |
2075
ec62da254d4d
(set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents:
2023
diff
changeset
|
4469 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
|
4470 At top-level, as an editor command, this simply beeps." |
475 | 4471 (interactive) |
4042
4b4ab64225f7
(deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents:
4040
diff
changeset
|
4472 (deactivate-mark) |
57853
d50014ac219f
(keyboard-quit): Call kmacro-keyboard-quit.
Kim F. Storm <storm@cua.dk>
parents:
57688
diff
changeset
|
4473 (if (fboundp 'kmacro-keyboard-quit) |
d50014ac219f
(keyboard-quit): Call kmacro-keyboard-quit.
Kim F. Storm <storm@cua.dk>
parents:
57688
diff
changeset
|
4474 (kmacro-keyboard-quit)) |
47353
6979a589f9c7
(keyboard-quit): Set defining-kbd-macro to nil to
Kim F. Storm <storm@cua.dk>
parents:
47346
diff
changeset
|
4475 (setq defining-kbd-macro nil) |
475 | 4476 (signal 'quit nil)) |
4477 | |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
4478 (defvar buffer-quit-function nil |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
4479 "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
|
4480 \\[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
|
4481 \(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
|
4482 |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
4483 (defun keyboard-escape-quit () |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
4484 "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
|
4485 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
|
4486 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
|
4487 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
|
4488 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
|
4489 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
|
4490 (interactive) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
4491 (cond ((eq last-command 'mode-exited) nil) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
4492 ((> (minibuffer-depth) 0) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
4493 (abort-recursive-edit)) |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
4494 (current-prefix-arg |
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
4495 nil) |
58917
44dfc09c6b67
* simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents:
58754
diff
changeset
|
4496 ((and transient-mark-mode mark-active) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
4497 (deactivate-mark)) |
17355
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
4498 ((> (recursion-depth) 0) |
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
4499 (exit-recursive-edit)) |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
4500 (buffer-quit-function |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
4501 (funcall buffer-quit-function)) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
4502 ((not (one-window-p t)) |
17355
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
4503 (delete-other-windows)) |
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
4504 ((string-match "^ \\*" (buffer-name (current-buffer))) |
dc683d40dde5
(keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents:
17276
diff
changeset
|
4505 (bury-buffer)))) |
10085
f7b9813ea757
(keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents:
10048
diff
changeset
|
4506 |
44252
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
4507 (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
|
4508 "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
|
4509 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
|
4510 specification for `play-sound'." |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
4511 (interactive "fPlay sound file: ") |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
4512 (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
|
4513 (if volume |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
4514 (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
|
4515 (if device |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
4516 (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
|
4517 (push 'sound sound) |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
4518 (play-sound sound))) |
0cdafef85267
(play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents:
44208
diff
changeset
|
4519 |
59567
638fd0a9f545
(just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents:
59486
diff
changeset
|
4520 |
27234
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
4521 (defcustom read-mail-command 'rmail |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
4522 "*Your preference for a mail reading package. |
31573 | 4523 This is used by some keybindings which support reading mail. |
4524 See also `mail-user-agent' concerning sending mail." | |
27234
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
4525 :type '(choice (function-item rmail) |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
4526 (function-item gnus) |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
4527 (function-item mh-rmail) |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
4528 (function :tag "Other")) |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
4529 :version "21.1" |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
4530 :group 'mail) |
bf32d38f9721
(with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents:
27096
diff
changeset
|
4531 |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4532 (defcustom mail-user-agent 'sendmail-user-agent |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
4533 "*Your preference for a mail composition package. |
31573 | 4534 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
|
4535 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
|
4536 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
|
4537 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
4538 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
|
4539 |
31573 | 4540 `sendmail-user-agent' -- use the default Emacs Mail package. |
4541 See Info node `(emacs)Sending Mail'. | |
4542 `mh-e-user-agent' -- use the Emacs interface to the MH mail system. | |
4543 See Info node `(mh-e)'. | |
4544 `message-user-agent' -- use the Gnus Message package. | |
4545 See Info node `(message)'. | |
4546 `gnus-user-agent' -- like `message-user-agent', but with Gnus | |
4547 paraphernalia, particularly the Gcc: header for | |
4548 archiving. | |
15988
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
4549 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
4550 Additional valid symbols may be available; check with the author of |
34687 | 4551 your package for details. The function should return non-nil if it |
4552 succeeds. | |
31573 | 4553 |
4554 See also `read-mail-command' concerning reading mail." | |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4555 :type '(radio (function-item :tag "Default Emacs mail" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4556 :format "%t\n" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4557 sendmail-user-agent) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4558 (function-item :tag "Emacs interface to MH" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4559 :format "%t\n" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4560 mh-e-user-agent) |
31573 | 4561 (function-item :tag "Gnus Message package" |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4562 :format "%t\n" |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4563 message-user-agent) |
31573 | 4564 (function-item :tag "Gnus Message with full Gnus features" |
4565 :format "%t\n" | |
4566 gnus-user-agent) | |
17663
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4567 (function :tag "Other")) |
d2c64a1563f7
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17662
diff
changeset
|
4568 :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
|
4569 |
6a1a664be9f6
(do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents:
15892
diff
changeset
|
4570 (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
|
4571 '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
|
4572 '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
|
4573 |
21906
2ee50035ee1b
(rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents:
21847
diff
changeset
|
4574 (defun rfc822-goto-eoh () |
2ee50035ee1b
(rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents:
21847
diff
changeset
|
4575 ;; 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
|
4576 (goto-char (point-min)) |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4577 (when (re-search-forward |
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
4578 "^\\([:\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
|
4579 (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
|
4580 |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
4581 (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
|
4582 switch-function yank-action |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
4583 send-actions) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
4584 (if switch-function |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
4585 (let ((special-display-buffer-names nil) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
4586 (special-display-regexps nil) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
4587 (same-window-buffer-names nil) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
4588 (same-window-regexps nil)) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
4589 (funcall switch-function "*mail*"))) |
53411
f0c057d16a15
(sendmail-user-agent-compose): Use assoc-string.
Richard M. Stallman <rms@gnu.org>
parents:
53097
diff
changeset
|
4590 (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
|
4591 (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
|
4592 (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
|
4593 (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
|
4594 continue |
4de96b605e55
2005-09-15 Chong Yidong <cyd@stupidchicken.com>
Chong Yidong <cyd@stupidchicken.com>
parents:
65482
diff
changeset
|
4595 (error "Message aborted")) |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
4596 (save-excursion |
21906
2ee50035ee1b
(rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents:
21847
diff
changeset
|
4597 (rfc822-goto-eoh) |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
4598 (while other-headers |
28491
3e21859cd0e7
(sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents:
28193
diff
changeset
|
4599 (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
|
4600 '("in-reply-to" "cc" "body")) |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
4601 (insert (car (car other-headers)) ": " |
67213
818361523ce8
* longlines.el (longlines-mode): Add mail-setup-hook.
Chong Yidong <cyd@stupidchicken.com>
parents:
67181
diff
changeset
|
4602 (cdr (car other-headers)) |
818361523ce8
* longlines.el (longlines-mode): Add mail-setup-hook.
Chong Yidong <cyd@stupidchicken.com>
parents:
67181
diff
changeset
|
4603 (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
|
4604 (setq other-headers (cdr other-headers))) |
28491
3e21859cd0e7
(sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents:
28193
diff
changeset
|
4605 (when body |
3e21859cd0e7
(sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents:
28193
diff
changeset
|
4606 (forward-line 1) |
3e21859cd0e7
(sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents:
28193
diff
changeset
|
4607 (insert body)) |
18629
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
4608 t))) |
fbb38f6bf8dc
(sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents:
18618
diff
changeset
|
4609 |
16632
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
4610 (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
|
4611 switch-function yank-action send-actions) |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
4612 "Start composing a mail message to send. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
4613 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
|
4614 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
|
4615 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
|
4616 and the initial Subject field, respectively. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
4617 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
4618 OTHER-HEADERS is an alist specifying additional |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
4619 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
|
4620 HEADER and VALUE are strings. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
4621 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
4622 CONTINUE, if non-nil, says to continue editing a message already |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
4623 being composed. |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
4624 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
4625 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
|
4626 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
|
4627 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
4628 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
|
4629 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
|
4630 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
|
4631 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
|
4632 \(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
|
4633 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
|
4634 |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
4635 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
|
4636 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
|
4637 (interactive |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
4638 (list nil nil nil current-prefix-arg)) |
16632
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
4639 (let ((function (get mail-user-agent 'composefunc))) |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
4640 (funcall function to subject other-headers continue |
5dd86f31843a
(compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents:
16624
diff
changeset
|
4641 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
|
4642 |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
4643 (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
|
4644 yank-action send-actions) |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
4645 "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
|
4646 (interactive |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
4647 (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
|
4648 (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
|
4649 '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
|
4650 |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
4651 |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
4652 (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
|
4653 yank-action send-actions) |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
4654 "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
|
4655 (interactive |
1a6a798242d6
(compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents:
17589
diff
changeset
|
4656 (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
|
4657 (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
|
4658 '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
|
4659 |
17606
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
4660 (defvar set-variable-value-history nil |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
4661 "History of values entered with `set-variable'.") |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
4662 |
63717
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
4663 (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
|
4664 "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
|
4665 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
|
4666 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
|
4667 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
|
4668 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
|
4669 |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
4670 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
|
4671 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
|
4672 |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
4673 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
|
4674 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
|
4675 |
e06b5768debd
(set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents:
46647
diff
changeset
|
4676 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
|
4677 (interactive |
7c92848a9d80
(set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents:
22144
diff
changeset
|
4678 (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
|
4679 (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
|
4680 (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
|
4681 default-var) |
3213e48ea8b3
(set-variable): Use user-variable-p instead of symbolp.
Juri Linkov <juri@jurta.org>
parents:
66114
diff
changeset
|
4682 (read-variable "Set variable: "))) |
53097
bb31cf348e05
(set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
52966
diff
changeset
|
4683 (minibuffer-help-form '(describe-variable var)) |
bb31cf348e05
(set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
52966
diff
changeset
|
4684 (prop (get var 'variable-interactive)) |
63866
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4685 (obsolete (car (get var 'byte-obsolete-variable))) |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4686 (prompt (format "Set %s %s to value: " var |
53097
bb31cf348e05
(set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
52966
diff
changeset
|
4687 (cond ((local-variable-p var) |
63866
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4688 "(buffer-local)") |
53097
bb31cf348e05
(set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
52966
diff
changeset
|
4689 ((or current-prefix-arg |
bb31cf348e05
(set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
52966
diff
changeset
|
4690 (local-variable-if-set-p var)) |
63866
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4691 "buffer-locally") |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4692 (t "globally")))) |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4693 (val (progn |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4694 (when obsolete |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4695 (message (concat "`%S' is obsolete; " |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4696 (if (symbolp obsolete) "use `%S' instead" "%s")) |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4697 var obsolete) |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4698 (sit-for 3)) |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4699 (if prop |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4700 ;; Use VAR's `variable-interactive' property |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4701 ;; as an interactive spec for prompting. |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4702 (call-interactively `(lambda (arg) |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4703 (interactive ,prop) |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4704 arg)) |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4705 (read |
8fe9596925cd
(set-variable): Warn about obsolete user variables.
Juanma Barranquero <lekktu@gmail.com>
parents:
63750
diff
changeset
|
4706 (read-string prompt nil |
66281
3213e48ea8b3
(set-variable): Use user-variable-p instead of symbolp.
Juri Linkov <juri@jurta.org>
parents:
66114
diff
changeset
|
4707 'set-variable-value-history |
3213e48ea8b3
(set-variable): Use user-variable-p instead of symbolp.
Juri Linkov <juri@jurta.org>
parents:
66114
diff
changeset
|
4708 (format "%S" (symbol-value var)))))))) |
53097
bb31cf348e05
(set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents:
52966
diff
changeset
|
4709 (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
|
4710 |
63717
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
4711 (and (custom-variable-p variable) |
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
4712 (not (get variable 'custom-type)) |
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
4713 (custom-load-symbol variable)) |
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
4714 (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
|
4715 (when type |
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
4716 ;; Match with custom type. |
38432
4bbb59858499
(set-variable): Require 'cus-edit' instead of
Gerd Moellmann <gerd@gnu.org>
parents:
38027
diff
changeset
|
4717 (require 'cus-edit) |
17606
d8cd49a0529c
(set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents:
17594
diff
changeset
|
4718 (setq type (widget-convert type)) |
63717
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
4719 (unless (widget-apply type :match value) |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
4720 (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
|
4721 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
|
4722 |
e06b5768debd
(set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents:
46647
diff
changeset
|
4723 (if make-local |
63717
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
4724 (make-local-variable variable)) |
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
4725 |
2bd9653ec2f2
(set-variable): Args renamed; doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
63595
diff
changeset
|
4726 (set variable value) |
35203
dcf1f0621dbb
(set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents:
34909
diff
changeset
|
4727 |
dcf1f0621dbb
(set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents:
34909
diff
changeset
|
4728 ;; 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
|
4729 ;; 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
|
4730 (force-mode-line-update)) |
59567
638fd0a9f545
(just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents:
59486
diff
changeset
|
4731 |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
4732 ;; Define the major mode for lists of completions. |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
4733 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
4734 (defvar completion-list-mode-map nil |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
4735 "Local map for completion list buffers.") |
4217
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
4736 (or completion-list-mode-map |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
4737 (let ((map (make-sparse-keymap))) |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
4738 (define-key map [mouse-2] 'mouse-choose-completion) |
59397
fcfd5e8c8e77
(completion-list-mode-map): Map follow-link to mouse-face.
Kim F. Storm <storm@cua.dk>
parents:
59261
diff
changeset
|
4739 (define-key map [follow-link] 'mouse-face) |
7762
763a8b8e7363
(completion-list-mode-map): Unbind down-mouse-2.
Richard M. Stallman <rms@gnu.org>
parents:
7726
diff
changeset
|
4740 (define-key map [down-mouse-2] nil) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4741 (define-key map "\C-m" 'choose-completion) |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
4742 (define-key map "\e\e\e" 'delete-completion-window) |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
4743 (define-key map [left] 'previous-completion) |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
4744 (define-key map [right] 'next-completion) |
4217
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
4745 (setq completion-list-mode-map map))) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
4746 |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
4747 ;; 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
|
4748 (put 'completion-list-mode 'mode-class 'special) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
4749 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
4750 (defvar completion-reference-buffer nil |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
4751 "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
|
4752 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
|
4753 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
|
4754 |
16924
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
4755 (defvar completion-no-auto-exit nil |
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
4756 "Non-nil means `choose-completion-string' should never exit the minibuffer. |
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
4757 This also applies to other functions such as `choose-completion' |
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
4758 and `mouse-choose-completion'.") |
231033e9a053
(completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
16851
diff
changeset
|
4759 |
11313
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
4760 (defvar completion-base-size nil |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
4761 "Number of chars at beginning of minibuffer not involved in completion. |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
4762 This is a local variable in the completion list buffer |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
4763 but it talks about the buffer in `completion-reference-buffer'. |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
4764 If this is nil, it means to compare text to determine which part |
5704f8216dbd
(completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents:
11235
diff
changeset
|
4765 of the tail end of the buffer's text is involved in completion.") |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
4766 |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
4767 (defun delete-completion-window () |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
4768 "Delete the completion list window. |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
4769 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
|
4770 (interactive) |
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
4771 (let ((buf completion-reference-buffer)) |
16851
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
4772 (if (one-window-p t) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
4773 (if (window-dedicated-p (selected-window)) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
4774 (delete-frame (selected-frame))) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
4775 (delete-window (selected-window)) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
4776 (if (get-buffer-window buf) |
a689a6716261
(delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents:
16803
diff
changeset
|
4777 (select-window (get-buffer-window buf)))))) |
10165
10a032873be6
(buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
10085
diff
changeset
|
4778 |
10284
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
4779 (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
|
4780 "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
|
4781 (interactive "p") |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
4782 (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
|
4783 |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
4784 (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
|
4785 "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
|
4786 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
|
4787 (interactive "p") |
33781
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
4788 (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
|
4789 (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
|
4790 ;; 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
|
4791 (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
|
4792 (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
|
4793 ;; 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
|
4794 (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
|
4795 (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
|
4796 (setq n (1- n))) |
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
4797 (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
|
4798 (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
|
4799 ;; 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
|
4800 (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
|
4801 (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
|
4802 (point) 'mouse-face nil beg))) |
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
4803 ;; 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
|
4804 (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
|
4805 (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
|
4806 (point) 'mouse-face nil beg))) |
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
4807 ;; 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
|
4808 (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
|
4809 (point) 'mouse-face nil beg)) |
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
4810 (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
|
4811 |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4812 (defun choose-completion () |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4813 "Choose the completion that point is in or next to." |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4814 (interactive) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
4815 (let (beg end completion (buffer completion-reference-buffer) |
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
4816 (base-size completion-base-size)) |
8203
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
4817 (if (and (not (eobp)) (get-text-property (point) 'mouse-face)) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
4818 (setq end (point) beg (1+ (point)))) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
4819 (if (and (not (bobp)) (get-text-property (1- (point)) 'mouse-face)) |
10959
e43125b71452
(completion-setup-function): Set completion-base-size.
Richard M. Stallman <rms@gnu.org>
parents:
10949
diff
changeset
|
4820 (setq end (1- (point)) beg (point))) |
8203
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
4821 (if (null beg) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
4822 (error "No completion here")) |
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
4823 (setq beg (previous-single-property-change beg 'mouse-face)) |
8380
40ab7df62402
(choose-completion): Check for next-single-property-change returning nil.
Richard M. Stallman <rms@gnu.org>
parents:
8309
diff
changeset
|
4824 (setq end (or (next-single-property-change end 'mouse-face) (point-max))) |
67621
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
4825 (setq completion (buffer-substring-no-properties beg end)) |
8468
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
4826 (let ((owindow (selected-window))) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
4827 (if (and (one-window-p t 'selected-frame) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
4828 (window-dedicated-p (selected-window))) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
4829 ;; 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
|
4830 (iconify-frame (selected-frame)) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
4831 (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
|
4832 (bury-buffer))) |
52940ba43041
(choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents:
8442
diff
changeset
|
4833 (select-window owindow)) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
4834 (choose-completion-string completion buffer base-size))) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4835 |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4836 ;; 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
|
4837 ;; that can be found before POINT. |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4838 (defun choose-completion-delete-max-match (string) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4839 (let ((opoint (point)) |
46516
25e7debccc64
(choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
46409
diff
changeset
|
4840 len) |
25e7debccc64
(choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
46409
diff
changeset
|
4841 ;; Try moving back by the length of the string. |
25e7debccc64
(choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
46409
diff
changeset
|
4842 (goto-char (max (- (point) (length string)) |
25e7debccc64
(choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
46409
diff
changeset
|
4843 (minibuffer-prompt-end))) |
25e7debccc64
(choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
46409
diff
changeset
|
4844 ;; See how far back we were actually able to move. That is the |
25e7debccc64
(choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
46409
diff
changeset
|
4845 ;; upper bound on how much we can match and delete. |
25e7debccc64
(choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
46409
diff
changeset
|
4846 (setq len (- opoint (point))) |
7574
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
4847 (if completion-ignore-case |
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
4848 (setq string (downcase string))) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4849 (while (and (> len 0) |
46516
25e7debccc64
(choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents:
46409
diff
changeset
|
4850 (let ((tail (buffer-substring (point) opoint))) |
7574
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
4851 (if completion-ignore-case |
040547adfab2
(completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents:
7463
diff
changeset
|
4852 (setq tail (downcase tail))) |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4853 (not (string= tail (substring string 0 len))))) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4854 (setq len (1- len)) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4855 (forward-char 1)) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4856 (delete-char len))) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4857 |
45607
98941f178aa2
(choose-completion-string-functions): New special hook.
Kim F. Storm <storm@cua.dk>
parents:
45586
diff
changeset
|
4858 (defvar choose-completion-string-functions nil |
45612 | 4859 "Functions that may override the normal insertion of a completion choice. |
4860 These functions are called in order with four arguments: | |
4861 CHOICE - the string to insert in the buffer, | |
4862 BUFFER - the buffer in which the choice should be inserted, | |
47266
b8ac98a8d336
(choose-completion-string-functions): Fix spacing.
Juanma Barranquero <lekktu@gmail.com>
parents:
47182
diff
changeset
|
4863 MINI-P - non-nil iff BUFFER is a minibuffer, and |
45615
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
4864 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
|
4865 the string being completed. |
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
4866 |
45612 | 4867 If a function in the list returns non-nil, that function is supposed |
4868 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
|
4869 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
|
4870 |
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
4871 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
|
4872 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
|
4873 |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
4874 (defun choose-completion-string (choice &optional buffer base-size) |
45615
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
4875 "Switch to BUFFER and insert the completion choice CHOICE. |
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
4876 BASE-SIZE, if non-nil, says how many characters of BUFFER's text |
46409
cb5bcb2c81ee
(choose-completion-string): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
46175
diff
changeset
|
4877 to keep. If it is nil, we call `choose-completion-delete-max-match' |
cb5bcb2c81ee
(choose-completion-string): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
46175
diff
changeset
|
4878 to decide what to delete." |
45615
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
4879 |
58054a96d922
(choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
45612
diff
changeset
|
4880 ;; 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
|
4881 ;; 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
|
4882 ;; 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
|
4883 |
52046
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
4884 (let* ((buffer (or buffer completion-reference-buffer)) |
6718a30c3752
(choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents:
51957
diff
changeset
|
4885 (mini-p (minibufferp buffer))) |
7333
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
4886 ;; 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
|
4887 ;; active minibuffer. |
27050
5c0c5089979c
(choose-completion-string): In minibuffer,
Richard M. Stallman <rms@gnu.org>
parents:
26884
diff
changeset
|
4888 (if (and mini-p |
11159
edf66df6fbe9
(choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
11140
diff
changeset
|
4889 (or (not (active-minibuffer-window)) |
edf66df6fbe9
(choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
11140
diff
changeset
|
4890 (not (equal buffer |
edf66df6fbe9
(choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents:
11140
diff
changeset
|
4891 (window-buffer (active-minibuffer-window)))))) |
7333
7a0395228878
(choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents:
7076
diff
changeset
|
4892 (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
|
4893 ;; 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
|
4894 (set-buffer buffer) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49585
diff
changeset
|
4895 (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
|
4896 'choose-completion-string-functions |
8287dca5eb2d
(what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47316
diff
changeset
|
4897 choice buffer mini-p base-size) |
8287dca5eb2d
(what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47316
diff
changeset
|
4898 ;; Insert the completion into the buffer where it was requested. |
45612 | 4899 (if base-size |
4900 (delete-region (+ base-size (if mini-p | |
4901 (minibuffer-prompt-end) | |
4902 (point-min))) | |
4903 (point)) | |
4904 (choose-completion-delete-max-match choice)) | |
4905 (insert choice) | |
4906 (remove-text-properties (- (point) (length choice)) (point) | |
4907 '(mouse-face nil)) | |
4908 ;; Update point in the window that BUFFER is showing in. | |
4909 (let ((window (get-buffer-window buffer t))) | |
4910 (set-window-point window (point))) | |
4911 ;; If completing for the minibuffer, exit it with this choice. | |
4912 (and (not completion-no-auto-exit) | |
4913 (equal buffer (window-buffer (minibuffer-window))) | |
4914 minibuffer-completion-table | |
4915 ;; If this is reading a file name, and the file name chosen | |
4916 ;; is a directory, don't exit the minibuffer. | |
4917 (if (and (eq minibuffer-completion-table 'read-file-name-internal) | |
4918 (file-directory-p (field-string (point-max)))) | |
4919 (let ((mini (active-minibuffer-window))) | |
4920 (select-window mini) | |
4921 (when minibuffer-auto-raise | |
4922 (raise-frame (window-frame mini)))) | |
4923 (exit-minibuffer))))))) | |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4924 |
4217
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
4925 (defun completion-list-mode () |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
4926 "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
|
4927 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
|
4928 to select the completion near point. |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4929 Use \\<completion-list-mode-map>\\[mouse-choose-completion] to select one\ |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
4930 with the mouse." |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
4931 (interactive) |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
4932 (kill-all-local-variables) |
4217
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
4933 (use-local-map completion-list-mode-map) |
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
4934 (setq mode-name "Completion List") |
997e8a52f9fd
(completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents:
4103
diff
changeset
|
4935 (setq major-mode 'completion-list-mode) |
8479
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
4936 (make-local-variable 'completion-base-size) |
582ac9a744c4
(completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
8468
diff
changeset
|
4937 (setq completion-base-size nil) |
62739
1c2cba6e4010
(completion-list-mode): Use run-mode-hooks.
Lute Kamstra <lute@gnu.org>
parents:
62632
diff
changeset
|
4938 (run-mode-hooks 'completion-list-mode-hook)) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
4939 |
37300
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
4940 (defun completion-list-mode-finish () |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
4941 "Finish setup of the completions buffer. |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
4942 Called from `temp-buffer-show-hook'." |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
4943 (when (eq major-mode 'completion-list-mode) |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
4944 (toggle-read-only 1))) |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
4945 |
76c94d3124d6
(completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
37248
diff
changeset
|
4946 (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
|
4947 |
20482
1fe822fa93e6
(completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents:
20465
diff
changeset
|
4948 (defvar completion-setup-hook nil |
1fe822fa93e6
(completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents:
20465
diff
changeset
|
4949 "Normal hook run at the end of setting up a completion list buffer. |
1fe822fa93e6
(completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents:
20465
diff
changeset
|
4950 When this hook is run, the current buffer is the one in which the |
1fe822fa93e6
(completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents:
20465
diff
changeset
|
4951 command to display the completion list buffer was run. |
66114
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65862
diff
changeset
|
4952 The completion list buffer is available as the value of `standard-output'. |
66823
e0104334e066
(what-cursor-position): Print (EOB) instead of (100%)
Kim F. Storm <storm@cua.dk>
parents:
66671
diff
changeset
|
4953 The common prefix substring for completion may be available as the |
66114
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65862
diff
changeset
|
4954 value of `completion-common-substring'. See also `display-completion-list'.") |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65862
diff
changeset
|
4955 |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65862
diff
changeset
|
4956 |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65862
diff
changeset
|
4957 ;; 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
|
4958 |
54910
2ac3325ab7ec
(completions-common-part): Rename from completion-de-emphasis.
Masatake YAMATO <jet@gyve.org>
parents:
54909
diff
changeset
|
4959 (defface completions-first-difference |
54554
f1717549fabe
(completion-setup-function): Emphasize the first uncommon characters in the completions;and de-emphasize the common prefix substrings.
Masatake YAMATO <jet@gyve.org>
parents:
54418
diff
changeset
|
4960 '((t (:inherit bold))) |
f1717549fabe
(completion-setup-function): Emphasize the first uncommon characters in the completions;and de-emphasize the common prefix substrings.
Masatake YAMATO <jet@gyve.org>
parents:
54418
diff
changeset
|
4961 "Face put on the first uncommon character in completions in *Completions* buffer." |
f1717549fabe
(completion-setup-function): Emphasize the first uncommon characters in the completions;and de-emphasize the common prefix substrings.
Masatake YAMATO <jet@gyve.org>
parents:
54418
diff
changeset
|
4962 :group 'completion) |
f1717549fabe
(completion-setup-function): Emphasize the first uncommon characters in the completions;and de-emphasize the common prefix substrings.
Masatake YAMATO <jet@gyve.org>
parents:
54418
diff
changeset
|
4963 |
54910
2ac3325ab7ec
(completions-common-part): Rename from completion-de-emphasis.
Masatake YAMATO <jet@gyve.org>
parents:
54909
diff
changeset
|
4964 (defface completions-common-part |
54554
f1717549fabe
(completion-setup-function): Emphasize the first uncommon characters in the completions;and de-emphasize the common prefix substrings.
Masatake YAMATO <jet@gyve.org>
parents:
54418
diff
changeset
|
4965 '((t (:inherit default))) |
55177
144273ac799a
(kill-ring-save): Use blink-matching-delay instead of the constant value 1.
Juri Linkov <juri@jurta.org>
parents:
55087
diff
changeset
|
4966 "Face put on the common prefix substring in completions in *Completions* buffer. |
144273ac799a
(kill-ring-save): Use blink-matching-delay instead of the constant value 1.
Juri Linkov <juri@jurta.org>
parents:
55087
diff
changeset
|
4967 The idea of `completions-common-part' is that you can use it to |
144273ac799a
(kill-ring-save): Use blink-matching-delay instead of the constant value 1.
Juri Linkov <juri@jurta.org>
parents:
55087
diff
changeset
|
4968 make the common parts less visible than normal, so that the rest |
144273ac799a
(kill-ring-save): Use blink-matching-delay instead of the constant value 1.
Juri Linkov <juri@jurta.org>
parents:
55087
diff
changeset
|
4969 of the differing parts is, by contrast, slightly highlighted." |
54554
f1717549fabe
(completion-setup-function): Emphasize the first uncommon characters in the completions;and de-emphasize the common prefix substrings.
Masatake YAMATO <jet@gyve.org>
parents:
54418
diff
changeset
|
4970 :group 'completion) |
8203
7f13bc5470d9
(completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents:
8080
diff
changeset
|
4971 |
56613
05c3cf703d59
(completion-root-regexp): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56505
diff
changeset
|
4972 ;; This is for packages that need to bind it to a non-default regexp |
05c3cf703d59
(completion-root-regexp): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56505
diff
changeset
|
4973 ;; in order to make the first-differing character highlight work |
05c3cf703d59
(completion-root-regexp): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56505
diff
changeset
|
4974 ;; to their liking |
05c3cf703d59
(completion-root-regexp): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56505
diff
changeset
|
4975 (defvar completion-root-regexp "^/" |
05c3cf703d59
(completion-root-regexp): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56505
diff
changeset
|
4976 "Regexp to use in `completion-setup-function' to find the root directory.") |
05c3cf703d59
(completion-root-regexp): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents:
56505
diff
changeset
|
4977 |
66114
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65862
diff
changeset
|
4978 (defvar completion-common-substring nil |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65862
diff
changeset
|
4979 "Common prefix substring to use in `completion-setup-function' to put faces. |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65862
diff
changeset
|
4980 The value is set by `display-completion-list' during running `completion-setup-hook'. |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65862
diff
changeset
|
4981 |
67621
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
4982 To put faces `completions-first-difference' and `completions-common-part' |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
4983 in the `*Completions*' buffer, the common prefix substring in completions |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
4984 is needed as a hint. (The minibuffer is a special case. The content |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
4985 of the minibuffer before point is always the common substring.)") |
66114
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65862
diff
changeset
|
4986 |
13abee3a9bc6
* message.el (message-expand-group): Pass the common
Masatake YAMATO <jet@gyve.org>
parents:
65862
diff
changeset
|
4987 ;; 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
|
4988 ;; 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
|
4989 (defun completion-setup-function () |
66595
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
4990 (let* ((mainbuf (current-buffer)) |
67621
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
4991 (mbuf-contents (minibuffer-completion-contents)) |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
4992 common-string-length) |
55699
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4993 ;; When reading a file name in the minibuffer, |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4994 ;; set default-directory in the minibuffer |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4995 ;; so it will get copied into the completion list buffer. |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4996 (if minibuffer-completing-file-name |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4997 (with-current-buffer mainbuf |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4998 (setq default-directory (file-name-directory mbuf-contents)))) |
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
4999 (with-current-buffer standard-output |
6160
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
5000 (completion-list-mode) |
66595
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
5001 (set (make-local-variable 'completion-reference-buffer) mainbuf) |
66950
deb1ca5162cd
(blink-matching-open): Simplify a bit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66823
diff
changeset
|
5002 (setq completion-base-size |
67621
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5003 (cond |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5004 ((and (symbolp minibuffer-completion-table) |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5005 (get minibuffer-completion-table 'completion-base-size-function)) |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5006 ;; To compute base size, a function can use the global value of |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5007 ;; completion-common-substring or minibuffer-completion-contents. |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5008 (with-current-buffer mainbuf |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5009 (funcall (get minibuffer-completion-table |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5010 'completion-base-size-function)))) |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5011 (minibuffer-completing-file-name |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5012 ;; For file name completion, use the number of chars before |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5013 ;; the start of the file name component at point. |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5014 (with-current-buffer mainbuf |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5015 (save-excursion |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5016 (skip-chars-backward completion-root-regexp) |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5017 (- (point) (minibuffer-prompt-end))))) |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5018 ;; Otherwise, in minibuffer, the base size is 0. |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5019 ((minibufferp mainbuf) 0))) |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5020 (setq common-string-length |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5021 (cond |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5022 (completion-common-substring |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5023 (length completion-common-substring)) |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5024 (completion-base-size |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5025 (- (length mbuf-contents) completion-base-size)))) |
55699
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
5026 ;; Put faces on first uncommon characters and common parts. |
67621
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5027 (when (and (integerp common-string-length) (>= common-string-length 0)) |
66595
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
5028 (let ((element-start (point-min)) |
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
5029 (maxp (point-max)) |
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
5030 element-common-end) |
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
5031 (while (and (setq element-start |
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
5032 (next-single-property-change |
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
5033 element-start 'mouse-face)) |
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
5034 (< (setq element-common-end |
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
5035 (+ element-start common-string-length)) |
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
5036 maxp)) |
67299
8aa8220db142
(completion-setup-function): Put completions-common-part
Juri Linkov <juri@jurta.org>
parents:
67243
diff
changeset
|
5037 (when (get-char-property element-start 'mouse-face) |
67621
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5038 (if (and (> common-string-length 0) |
0d6832f365fb
(choose-completion): Use `buffer-substring-no-properties'
Juri Linkov <juri@jurta.org>
parents:
67602
diff
changeset
|
5039 (get-char-property (1- element-common-end) 'mouse-face)) |
67299
8aa8220db142
(completion-setup-function): Put completions-common-part
Juri Linkov <juri@jurta.org>
parents:
67243
diff
changeset
|
5040 (put-text-property element-start element-common-end |
8aa8220db142
(completion-setup-function): Put completions-common-part
Juri Linkov <juri@jurta.org>
parents:
67243
diff
changeset
|
5041 'font-lock-face 'completions-common-part)) |
8aa8220db142
(completion-setup-function): Put completions-common-part
Juri Linkov <juri@jurta.org>
parents:
67243
diff
changeset
|
5042 (if (get-char-property element-common-end 'mouse-face) |
8aa8220db142
(completion-setup-function): Put completions-common-part
Juri Linkov <juri@jurta.org>
parents:
67243
diff
changeset
|
5043 (put-text-property element-common-end (1+ element-common-end) |
8aa8220db142
(completion-setup-function): Put completions-common-part
Juri Linkov <juri@jurta.org>
parents:
67243
diff
changeset
|
5044 'font-lock-face 'completions-first-difference)))))) |
54554
f1717549fabe
(completion-setup-function): Emphasize the first uncommon characters in the completions;and de-emphasize the common prefix substrings.
Masatake YAMATO <jet@gyve.org>
parents:
54418
diff
changeset
|
5045 ;; Insert help string. |
6160
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
5046 (goto-char (point-min)) |
28113
bfff8ed76f1c
(completion-setup-function): Use display-color-p.
Dave Love <fx@gnu.org>
parents:
27836
diff
changeset
|
5047 (if (display-mouse-p) |
6160
5a40bc311e2f
(completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents:
5944
diff
changeset
|
5048 (insert (substitute-command-keys |
6549
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
5049 "Click \\[mouse-choose-completion] on a completion to select it.\n"))) |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
5050 (insert (substitute-command-keys |
d66e48956d3e
(choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents:
6539
diff
changeset
|
5051 "In this buffer, type \\[choose-completion] to \ |
23450
085606778286
(completion-fixup-function): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents:
23447
diff
changeset
|
5052 select the completion near point.\n\n"))))) |
4082
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
5053 |
1d4aa358d9a0
(completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents:
4044
diff
changeset
|
5054 (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
|
5055 |
66595
1d442f601f13
(eval-expression-print-format): Use lisp-readable syntax
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
66536
diff
changeset
|
5056 (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
|
5057 (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
|
5058 |
832491972c95
(switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents:
10252
diff
changeset
|
5059 (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
|
5060 "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
|
5061 (interactive) |
12483
ec77cb3940f1
(switch-to-completions): Make a completions window if none.
Richard M. Stallman <rms@gnu.org>
parents:
12428
diff
changeset
|
5062 ;; Make sure we have a completions window. |
ec77cb3940f1
(switch-to-completions): Make a completions window if none.
Richard M. Stallman <rms@gnu.org>
parents:
12428
diff
changeset
|
5063 (or (get-buffer-window "*Completions*") |
ec77cb3940f1
(switch-to-completions): Make a completions window if none.
Richard M. Stallman <rms@gnu.org>
parents:
12428
diff
changeset
|
5064 (minibuffer-completion-help)) |
20663
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
5065 (let ((window (get-buffer-window "*Completions*"))) |
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
5066 (when window |
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
5067 (select-window window) |
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
5068 (goto-char (point-min)) |
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
5069 (search-forward "\n\n") |
2483aa76b98d
(switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents:
20510
diff
changeset
|
5070 (forward-line 1)))) |
68345
b10c2ebde562
(clone-buffer, clone-indirect-buffer, clone-indirect-buffer-other-window):
Juri Linkov <juri@jurta.org>
parents:
68280
diff
changeset
|
5071 |
b10c2ebde562
(clone-buffer, clone-indirect-buffer, clone-indirect-buffer-other-window):
Juri Linkov <juri@jurta.org>
parents:
68280
diff
changeset
|
5072 ;;; 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
|
5073 |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5074 ;; 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
|
5075 ;; to the following event. |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5076 |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5077 (defun event-apply-alt-modifier (ignore-prompt) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
5078 "\\<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
|
5079 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
|
5080 (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
|
5081 (defun event-apply-super-modifier (ignore-prompt) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
5082 "\\<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
|
5083 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
|
5084 (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
|
5085 (defun event-apply-hyper-modifier (ignore-prompt) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
5086 "\\<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
|
5087 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
|
5088 (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
|
5089 (defun event-apply-shift-modifier (ignore-prompt) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
5090 "\\<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
|
5091 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
|
5092 (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
|
5093 (defun event-apply-control-modifier (ignore-prompt) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
5094 "\\<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
|
5095 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
|
5096 (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
|
5097 (defun event-apply-meta-modifier (ignore-prompt) |
50972
f9aa8c8600ff
(back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50870
diff
changeset
|
5098 "\\<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
|
5099 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
|
5100 (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
|
5101 |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5102 (defun event-apply-modifier (event symbol lshiftby prefix) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5103 "Apply a modifier flag to event EVENT. |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5104 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
|
5105 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
|
5106 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
|
5107 (if (numberp event) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5108 (cond ((eq symbol 'control) |
11201
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
5109 (if (and (<= (downcase event) ?z) |
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
5110 (>= (downcase event) ?a)) |
11140
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5111 (- (downcase event) ?a -1) |
11201
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
5112 (if (and (<= (downcase event) ?Z) |
f6caea9275af
(event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents:
11159
diff
changeset
|
5113 (>= (downcase event) ?A)) |
11140
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5114 (- (downcase event) ?A -1) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5115 (logior (lsh 1 lshiftby) event)))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5116 ((eq symbol 'shift) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5117 (if (and (<= (downcase event) ?z) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5118 (>= (downcase event) ?a)) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5119 (upcase event) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5120 (logior (lsh 1 lshiftby) event))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5121 (t |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5122 (logior (lsh 1 lshiftby) event))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5123 (if (memq symbol (event-modifiers event)) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5124 event |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5125 (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
|
5126 (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
|
5127 (if (symbolp event) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5128 event-type |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5129 (cons event-type (cdr event))))))) |
97ed670a6123
(event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents:
11072
diff
changeset
|
5130 |
11206
60b7ab7d4fec
Change bindings of event-apply-control-modifier,
Karl Heuer <kwzh@gnu.org>
parents:
11201
diff
changeset
|
5131 (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
|
5132 (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
|
5133 (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
|
5134 (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
|
5135 (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
|
5136 (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
|
5137 |
3947
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5138 ;;;; Keypad support. |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5139 |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5140 ;;; Make the keypad keys act like ordinary typing keys. If people add |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5141 ;;; bindings for the function key symbols, then those bindings will |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5142 ;;; override these, so this shouldn't interfere with any existing |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5143 ;;; bindings. |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5144 |
5342
f38861038093
(setting up kp-... keys): Make ascii-character props.
Richard M. Stallman <rms@gnu.org>
parents:
5324
diff
changeset
|
5145 ;; 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
|
5146 (mapc |
3947
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5147 (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
|
5148 (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
|
5149 (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
|
5150 (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
|
5151 (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
|
5152 '((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
|
5153 (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
|
5154 (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
|
5155 (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
|
5156 (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
|
5157 (kp-multiply ?*) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5158 (kp-add ?+) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5159 (kp-separator ?,) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5160 (kp-subtract ?-) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5161 (kp-decimal ?.) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5162 (kp-divide ?/) |
924d8515c250
* simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents:
3936
diff
changeset
|
5163 (kp-equal ?=))) |
44906
fe8ce22fc4a1
(next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents:
44756
diff
changeset
|
5164 |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
5165 ;;;; |
26003
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5166 ;;;; forking a twin copy of a buffer. |
26457
285ab8ddc125
* simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents:
26356
diff
changeset
|
5167 ;;;; |
26003
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5168 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5169 (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
|
5170 "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
|
5171 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5172 (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
|
5173 "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
|
5174 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
|
5175 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
|
5176 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
|
5177 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
|
5178 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
|
5179 (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
|
5180 (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
|
5181 (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
|
5182 (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
|
5183 (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
|
5184 (new-process |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5185 (if (memq (process-status process) '(open)) |
43969 | 5186 (let ((args (process-contact process t))) |
5187 (setq args (plist-put args :name newname)) | |
5188 (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
|
5189 (if (process-buffer process) |
b03a9c537356
(clone-process): Copy process' plist to new process.
Kim F. Storm <storm@cua.dk>
parents:
49103
diff
changeset
|
5190 (current-buffer)))) |
43969 | 5191 (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
|
5192 (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
|
5193 (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
|
5194 (process-command process))))) |
43969 | 5195 (set-process-query-on-exit-flag |
5196 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
|
5197 (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
|
5198 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
|
5199 (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
|
5200 (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
|
5201 (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
|
5202 new-process))) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5203 |
44152 | 5204 ;; 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
|
5205 ;; - syntax-table |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5206 ;; - overlays |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5207 (defun clone-buffer (&optional newname display-flag) |
54418
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
5208 "Create and return a twin copy of the current buffer. |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
5209 Unlike an indirect buffer, the new buffer can be edited |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
5210 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
|
5211 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
|
5212 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
|
5213 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
|
5214 current buffer, with the proper suffix. If DISPLAY-FLAG is |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
5215 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
|
5216 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
|
5217 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
|
5218 |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
5219 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
|
5220 current buffer with appropriate suffix. However, if a prefix |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
5221 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
|
5222 minibuffer. |
37dfb033f901
(clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents:
54259
diff
changeset
|
5223 |
26003
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5224 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
|
5225 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
|
5226 (interactive |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
5227 (progn |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
5228 (if buffer-file-name |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
5229 (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
|
5230 (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
|
5231 (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
|
5232 (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
|
5233 (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
|
5234 t))) |
26003
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5235 (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
|
5236 (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
|
5237 (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
|
5238 (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
|
5239 (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
|
5240 (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
|
5241 (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
|
5242 (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
|
5243 (ptmin (point-min)) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5244 (ptmax (point-max)) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5245 (pt (point)) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5246 (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
|
5247 (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
|
5248 (mode major-mode) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5249 (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
|
5250 (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
|
5251 (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
|
5252 (save-restriction |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5253 (widen) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5254 (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
|
5255 (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
|
5256 (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
|
5257 (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
|
5258 (goto-char pt) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5259 (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
|
5260 (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
|
5261 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5262 ;; 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
|
5263 (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
|
5264 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5265 ;; 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
|
5266 (funcall mode) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5267 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5268 ;; Set up other local variables. |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5269 (mapcar (lambda (v) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5270 (condition-case () ;in case var is read-only |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5271 (if (symbolp v) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5272 (makunbound v) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5273 (set (make-local-variable (car v)) (cdr v))) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5274 (error nil))) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5275 lvars) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5276 |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5277 ;; 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
|
5278 ;; 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
|
5279 (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
|
5280 (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
|
5281 ;; 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
|
5282 ;; 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
|
5283 (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
|
5284 (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
|
5285 (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
|
5286 new)) |
f6c190ef2f45
(shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
25702
diff
changeset
|
5287 |
28624
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
5288 |
28659
17281c5a2834
(clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents:
28624
diff
changeset
|
5289 (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
|
5290 "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
|
5291 |
63592
153f4469d91a
(next-error-buffer-p, next-error-find-buffer): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents:
63487
diff
changeset
|
5292 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
|
5293 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
|
5294 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
|
5295 buffer's name. The name is modified by adding a `<N>' suffix to it |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
5296 or by incrementing the N in an existing suffix. |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
5297 |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
5298 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
|
5299 This is always done when called interactively. |
17281c5a2834
(clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents:
28624
diff
changeset
|
5300 |
64548
cff17c5abe4d
(clone-indirect-buffer): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
64289
diff
changeset
|
5301 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
|
5302 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
|
5303 (interactive |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
5304 (progn |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
5305 (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
|
5306 (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
|
5307 (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
|
5308 (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
|
5309 t))) |
0eb891bb0d3e
(clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents:
40530
diff
changeset
|
5310 (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
|
5311 (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
|
5312 (setq newname (or newname (buffer-name))) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
5313 (if (string-match "<[0-9]+>\\'" newname) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
5314 (setq newname (substring newname 0 (match-beginning 0)))) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
5315 (let* ((name (generate-new-buffer-name newname)) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
5316 (buffer (make-indirect-buffer (current-buffer) name t))) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
5317 (when display-flag |
33781
67e0378863cf
(comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33683
diff
changeset
|
5318 (pop-to-buffer buffer norecord)) |
28624
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
5319 buffer)) |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
5320 |
aef61acb21de
(clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
28491
diff
changeset
|
5321 |
68403
18c6a9d97dc1
(move-beginning-of-line): Take account of fields.
Richard M. Stallman <rms@gnu.org>
parents:
68352
diff
changeset
|
5322 (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
|
5323 "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
|
5324 (interactive |
c1db05754431
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68042
diff
changeset
|
5325 (progn |
c1db05754431
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68042
diff
changeset
|
5326 (if (get major-mode 'no-clone-indirect) |
c1db05754431
(set-mark-command): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
68042
diff
changeset
|
5327 (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
|
5328 (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
|
5329 (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
|
5330 t))) |
45064
6e3c5d67f0fe
(clone-indirect-buffer-other-window): Fix a typo in `pop-up-window'.
Eli Zaretskii <eliz@gnu.org>
parents:
44981
diff
changeset
|
5331 (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
|
5332 (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
|
5333 |
44906
fe8ce22fc4a1
(next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents:
44756
diff
changeset
|
5334 |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5335 ;;; Handling of Backspace and Delete keys. |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5336 |
60414
ce5c67075d6b
(normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60409
diff
changeset
|
5337 (defcustom normal-erase-is-backspace |
ce5c67075d6b
(normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60409
diff
changeset
|
5338 (and (not noninteractive) |
ce5c67075d6b
(normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60409
diff
changeset
|
5339 (or (memq system-type '(ms-dos windows-nt)) |
60609
1416f9f933e4
(normal-erase-is-backspace): Set default to t if running on Mac.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
60590
diff
changeset
|
5340 (eq window-system 'mac) |
60414
ce5c67075d6b
(normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60409
diff
changeset
|
5341 (and (memq window-system '(x)) |
ce5c67075d6b
(normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60409
diff
changeset
|
5342 (fboundp 'x-backspace-delete-keys-p) |
ce5c67075d6b
(normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60409
diff
changeset
|
5343 (x-backspace-delete-keys-p)) |
ce5c67075d6b
(normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60409
diff
changeset
|
5344 ;; If the terminal Emacs is running on has erase char |
ce5c67075d6b
(normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60409
diff
changeset
|
5345 ;; set to ^H, use the Backspace key for deleting |
ce5c67075d6b
(normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60409
diff
changeset
|
5346 ;; backward and, and the Delete key for deleting forward. |
ce5c67075d6b
(normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60409
diff
changeset
|
5347 (and (null window-system) |
ce5c67075d6b
(normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
60409
diff
changeset
|
5348 (eq tty-erase-char ?\^H)))) |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5349 "If non-nil, Delete key deletes forward and Backspace key deletes backward. |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5350 |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5351 On window systems, the default value of this option is chosen |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5352 according to the keyboard used. If the keyboard has both a Backspace |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5353 key and a Delete key, and both are mapped to their usual meanings, the |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5354 option's default value is set to t, so that Backspace can be used to |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5355 delete backward, and Delete can be used to delete forward. |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5356 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5357 If not running under a window system, customizing this option accomplishes |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5358 a similar effect by mapping C-h, which is usually generated by the |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5359 Backspace key, to DEL, and by mapping DEL to C-d via |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5360 `keyboard-translate'. The former functionality of C-h is available on |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5361 the F1 key. You should probably not use this setting if you don't |
34827
0f079e057295
(delete-key-deletes-forward): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
34713
diff
changeset
|
5362 have both Backspace, Delete and F1 keys. |
0f079e057295
(delete-key-deletes-forward): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
34713
diff
changeset
|
5363 |
0f079e057295
(delete-key-deletes-forward): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents:
34713
diff
changeset
|
5364 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
|
5365 call `normal-erase-is-backspace-mode' (which see) instead." |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5366 :type 'boolean |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5367 :group 'editing-basics |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5368 :version "21.1" |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5369 :set (lambda (symbol value) |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5370 ;; 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
|
5371 ;; dumping Emacs. It doesn't really matter. |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5372 (if (fboundp 'normal-erase-is-backspace-mode) |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5373 (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
|
5374 (set-default symbol value)))) |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5375 |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5376 |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5377 (defun normal-erase-is-backspace-mode (&optional arg) |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5378 "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
|
5379 |
37248
dadde28d1d99
(normal-erase-is-backspace-mode): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
37194
diff
changeset
|
5380 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
|
5381 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5382 On window systems, when this mode is on, Delete is mapped to C-d and |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5383 Backspace is mapped to DEL; when this mode is off, both Delete and |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5384 Backspace are mapped to DEL. (The remapping goes via |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5385 `function-key-map', so binding Delete or Backspace in the global or |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5386 local keymap will override that.) |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5387 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5388 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
|
5389 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
|
5390 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
|
5391 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
|
5392 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
|
5393 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
|
5394 `backward-kill-word'. |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5395 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5396 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
|
5397 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
|
5398 `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
|
5399 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
|
5400 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5401 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
|
5402 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
|
5403 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
|
5404 have both Backspace, Delete and F1 keys. |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5405 |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5406 See also `normal-erase-is-backspace'." |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5407 (interactive "P") |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5408 (setq normal-erase-is-backspace |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5409 (if arg |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5410 (> (prefix-numeric-value arg) 0) |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5411 (not normal-erase-is-backspace))) |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5412 |
34570
f6aeb731a068
(delete-key-deletes-forward-mode): Treat ms-dos and
Eli Zaretskii <eliz@gnu.org>
parents:
34553
diff
changeset
|
5413 (cond ((or (memq window-system '(x w32 mac pc)) |
f6aeb731a068
(delete-key-deletes-forward-mode): Treat ms-dos and
Eli Zaretskii <eliz@gnu.org>
parents:
34553
diff
changeset
|
5414 (memq system-type '(ms-dos windows-nt))) |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5415 (let ((bindings |
36030
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5416 `(([C-delete] [C-backspace]) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5417 ([M-delete] [M-backspace]) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5418 ([C-M-delete] [C-M-backspace]) |
35346
382fba2f10a6
(delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents:
35333
diff
changeset
|
5419 (,esc-map |
36030
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5420 [C-delete] [C-backspace]))) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5421 (old-state (lookup-key function-key-map [delete]))) |
35346
382fba2f10a6
(delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents:
35333
diff
changeset
|
5422 |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5423 (if normal-erase-is-backspace |
35346
382fba2f10a6
(delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents:
35333
diff
changeset
|
5424 (progn |
382fba2f10a6
(delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents:
35333
diff
changeset
|
5425 (define-key function-key-map [delete] [?\C-d]) |
35776
7ae7252c53c9
(delete-key-deletes-forward-mode): Treat `kp-delete'
Gerd Moellmann <gerd@gnu.org>
parents:
35709
diff
changeset
|
5426 (define-key function-key-map [kp-delete] [?\C-d]) |
35346
382fba2f10a6
(delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents:
35333
diff
changeset
|
5427 (define-key function-key-map [backspace] [?\C-?])) |
382fba2f10a6
(delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents:
35333
diff
changeset
|
5428 (define-key function-key-map [delete] [?\C-?]) |
35776
7ae7252c53c9
(delete-key-deletes-forward-mode): Treat `kp-delete'
Gerd Moellmann <gerd@gnu.org>
parents:
35709
diff
changeset
|
5429 (define-key function-key-map [kp-delete] [?\C-?]) |
35346
382fba2f10a6
(delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents:
35333
diff
changeset
|
5430 (define-key function-key-map [backspace] [?\C-?])) |
382fba2f10a6
(delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents:
35333
diff
changeset
|
5431 |
36030
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5432 ;; Maybe swap bindings of C-delete and C-backspace, etc. |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5433 (unless (equal old-state (lookup-key function-key-map [delete])) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5434 (dolist (binding bindings) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5435 (let ((map global-map)) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5436 (when (keymapp (car binding)) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5437 (setq map (car binding) binding (cdr binding))) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5438 (let* ((key1 (nth 0 binding)) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5439 (key2 (nth 1 binding)) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5440 (binding1 (lookup-key map key1)) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5441 (binding2 (lookup-key map key2))) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5442 (define-key map key1 binding2) |
6ef1520f4852
(delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents:
36021
diff
changeset
|
5443 (define-key map key2 binding1))))))) |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5444 (t |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5445 (if normal-erase-is-backspace |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5446 (progn |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5447 (keyboard-translate ?\C-h ?\C-?) |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5448 (keyboard-translate ?\C-? ?\C-d)) |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5449 (keyboard-translate ?\C-h ?\C-h) |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5450 (keyboard-translate ?\C-? ?\C-?)))) |
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5451 |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5452 (run-hooks 'normal-erase-is-backspace-hook) |
34553
bd89ec7640bb
(delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents:
34462
diff
changeset
|
5453 (if (interactive-p) |
37194
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5454 (message "Delete key deletes %s" |
299f754a4b17
(normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents:
37092
diff
changeset
|
5455 (if normal-erase-is-backspace "forward" "backward")))) |
51220
c7730f2ad484
(idle-update-delay): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents:
51219
diff
changeset
|
5456 |
51606
bee14d8ec0a6
(kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51597
diff
changeset
|
5457 (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
|
5458 "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
|
5459 |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
5460 (define-minor-mode visible-mode |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
5461 "Toggle Visible mode. |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
5462 With argument ARG turn Visible mode on iff ARG is positive. |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
5463 |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
5464 Enabling Visible mode makes all invisible text temporarily visible. |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
5465 Disabling Visible mode turns off that effect. Visible mode |
d8ab29cb1111
(visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents:
51706
diff
changeset
|
5466 works by saving the value of `buffer-invisibility-spec' and setting it to nil." |
51597
9b14210f4740
(vis-mode): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51461
diff
changeset
|
5467 :lighter " Vis" |
61232
728460f45e1e
(visible-mode): Use explicit :group keyword. This changes the group
Luc Teirlinck <teirllm@auburn.edu>
parents:
61121
diff
changeset
|
5468 :group 'editing-basics |
51606
bee14d8ec0a6
(kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51597
diff
changeset
|
5469 (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
|
5470 (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
|
5471 (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
|
5472 (when visible-mode |
51606
bee14d8ec0a6
(kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51597
diff
changeset
|
5473 (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
|
5474 buffer-invisibility-spec) |
bee14d8ec0a6
(kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51597
diff
changeset
|
5475 (setq buffer-invisibility-spec nil))) |
51597
9b14210f4740
(vis-mode): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents:
51461
diff
changeset
|
5476 |
40530
a0dc24114eee
(reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40069
diff
changeset
|
5477 ;; Minibuffer prompt stuff. |
39271
d56dcab29cce
(minibuffer-prompt-modification)
Gerd Moellmann <gerd@gnu.org>
parents:
39157
diff
changeset
|
5478 |
39289
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
5479 ;(defun minibuffer-prompt-modification (start end) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
5480 ; (error "You cannot modify the prompt")) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
5481 ; |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
5482 ; |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
5483 ;(defun minibuffer-prompt-insertion (start end) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
5484 ; (let ((inhibit-modification-hooks t)) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
5485 ; (delete-region start end) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
5486 ; ;; 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
|
5487 ; ;; and for the text deletion.above. |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
5488 ; (when (consp buffer-undo-list) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
5489 ; (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
|
5490 ; (message "You cannot modify the prompt"))) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
5491 ; |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
5492 ; |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49585
diff
changeset
|
5493 ;(setq minibuffer-prompt-properties |
39289
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
5494 ; (list 'modification-hooks '(minibuffer-prompt-modification) |
c5d6010e15ee
Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents:
39271
diff
changeset
|
5495 ; 'insert-in-front-hooks '(minibuffer-prompt-insertion))) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49585
diff
changeset
|
5496 ; |
39271
d56dcab29cce
(minibuffer-prompt-modification)
Gerd Moellmann <gerd@gnu.org>
parents:
39157
diff
changeset
|
5497 |
47462
1bbef0cbbf67
Provide `simple'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47408
diff
changeset
|
5498 (provide 'simple) |
52401 | 5499 |
55699
030ebc46c0c1
(do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55425
diff
changeset
|
5500 ;; arch-tag: 24af67c0-2a49-44f6-b3b1-312d8b570dfd |
658
7cbd4fcd8b0f
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
617
diff
changeset
|
5501 ;;; simple.el ends here |