annotate lisp/simple.el @ 63308:51d38cfbe542

Warn about using "cvs up -kb" if one intends to commit changes. Add a pointer to another site with detailed configure and build instructions. Suggest to look at config.log when configure fails. Add MinGW Make 3.80 to the list of successful combinations.
author Eli Zaretskii <eliz@gnu.org>
date Sat, 11 Jun 2005 11:31:29 +0000
parents bbac4c8066b4
children 1e618742c46c e58cb448e07c 173dee4e2611
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
1 ;;; simple.el --- basic editing commands for Emacs
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2
58754
b41534d7c63c (blink-matching-open): Obey syntax-table text properties.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58625
diff changeset
3 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
59626
48b06baddb8a (blink-matching-open): Strip extra info from syntax.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59598
diff changeset
4 ;; 2000, 2001, 2002, 2003, 2004, 2005
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
5 ;; Free Software Foundation, Inc.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
45078
829beb9a6a4b Follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 45064
diff changeset
7 ;; Maintainer: FSF
829beb9a6a4b Follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 45064
diff changeset
8 ;; Keywords: internal
829beb9a6a4b Follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 45064
diff changeset
9
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 ;; This file is part of GNU Emacs.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 ;; GNU Emacs is free software; you can redistribute it and/or modify
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 ;; it under the terms of the GNU General Public License as published by
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
14 ;; the Free Software Foundation; either version 2, or (at your option)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 ;; any later version.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20 ;; GNU General Public License for more details.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
22 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13960
diff changeset
23 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13960
diff changeset
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 13960
diff changeset
25 ;; Boston, MA 02111-1307, USA.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
26
2315
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
27 ;;; Commentary:
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
28
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
29 ;; A grab-bag of basic Emacs commands not specifically related to some
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
30 ;; major mode or to file-handling.
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
31
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
32 ;;; Code:
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33
26466
b32572666174 (with-syntax-table): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26457
diff changeset
34 (eval-when-compile
30820
4b32734572d8 Autoload widget-convert when compiling.
Dave Love <fx@gnu.org>
parents: 30441
diff changeset
35 (autoload 'widget-convert "wid-edit")
45637
f749c4851f51 Don't require cl.
Richard M. Stallman <rms@gnu.org>
parents: 45615
diff changeset
36 (autoload 'shell-mode "shell"))
26466
b32572666174 (with-syntax-table): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26457
diff changeset
37
61111
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
38 (defcustom idle-update-delay 0.5
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
39 "*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
40 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
41 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
42 :type 'number
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
43 :group 'display
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
44 :version "22.1")
26466
b32572666174 (with-syntax-table): New.
Gerd Moellmann <gerd@gnu.org>
parents: 26457
diff changeset
45
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
46 (defgroup killing nil
56005
54d79ab53dd3 (eval-expression-print-format): Don't print additional
Juri Linkov <juri@jurta.org>
parents: 55975
diff changeset
47 "Killing and yanking commands."
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
48 :group 'editing)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
49
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
50 (defgroup paren-matching nil
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
51 "Highlight (un)matching of parens and expressions."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
52 :group 'matching)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
53
44906
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
54 (defun next-buffer ()
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
55 "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
56 (interactive)
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
57 (let ((buffer (current-buffer)))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
58 (switch-to-buffer (other-buffer buffer))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
59 (bury-buffer buffer)))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
60
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
61 (defun prev-buffer ()
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
62 "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
63 (interactive)
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
64 (let ((list (nreverse (buffer-list)))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
65 found)
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
66 (while (and (not found) list)
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
67 (let ((buffer (car list)))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
68 (if (and (not (get-buffer-window buffer))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
69 (not (string-match "\\` " (buffer-name buffer))))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
70 (setq found buffer)))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
71 (setq list (cdr list)))
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
72 (switch-to-buffer found)))
56863
c8bb5aca0581 * simple.el (next-error): New defgroup and defface.
Juri Linkov <juri@jurta.org>
parents: 56862
diff changeset
73
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
74 ;;; next-error support framework
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
75
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
76 (defgroup next-error nil
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
77 "next-error support framework."
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
78 :group 'compilation
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59790
diff changeset
79 :version "22.1")
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
80
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
81 (defface next-error
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
82 '((t (:inherit region)))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
83 "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
84 :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
85 :version "22.1")
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
86
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
87 (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
88 "*Highlighting of locations in selected source buffers.
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
89 If number, highlight the locus in next-error face for given time in seconds.
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
90 If t, use persistent overlays fontified in next-error face.
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
91 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
92 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
93 :type '(choice (number :tag "Delay")
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
94 (const :tag "Persistent overlay" t)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
95 (const :tag "No highlighting" nil)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
96 (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
97 :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
98 :version "22.1")
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
99
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
100 (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
101 "*Highlighting of locations in non-selected source buffers.
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
102 If number, highlight the locus in next-error face for given time in seconds.
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
103 If t, use persistent overlays fontified in next-error face.
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
104 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
105 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
106 :type '(choice (number :tag "Delay")
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
107 (const :tag "Persistent overlay" t)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
108 (const :tag "No highlighting" nil)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
109 (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
110 :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
111 :version "22.1")
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
112
61070
ed6d9a5fc534 (next-error-highlight-timer): New variable.
Juri Linkov <juri@jurta.org>
parents: 60744
diff changeset
113 (defvar next-error-highlight-timer nil)
ed6d9a5fc534 (next-error-highlight-timer): New variable.
Juri Linkov <juri@jurta.org>
parents: 60744
diff changeset
114
61361
d5052fc4ea58 (next-error-overlay-arrow-position): New defvar.
Juri Linkov <juri@jurta.org>
parents: 61276
diff changeset
115 (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
116 (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
117 (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
118
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
119 (defvar next-error-last-buffer nil
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
120 "The most recent next-error buffer.
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
121 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
122 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
123 or \\[compile-goto-error].")
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
124
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
125 (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
126 "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
127 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
128 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
129 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
130 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
131 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
132 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
133 to navigate in it.")
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
134
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
135 (make-variable-buffer-local 'next-error-function)
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
136
58951
c7ebd794182b (next-error-buffer-p, next-error-find-buffer): Doc fix.
Juri Linkov <juri@jurta.org>
parents: 58917
diff changeset
137 (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
138 &optional avoid-current
58951
c7ebd794182b (next-error-buffer-p, next-error-find-buffer): Doc fix.
Juri Linkov <juri@jurta.org>
parents: 58917
diff changeset
139 extra-test-inclusive
58625
31d0b9422d7b simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents: 58354
diff changeset
140 extra-test-exclusive)
31d0b9422d7b simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents: 58354
diff changeset
141 "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
142
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
143 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
144 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
145
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
146 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
147 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
148 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
149
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
150 The function EXTRA-TEST-EXCLUSIVE, 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
151 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
152 that buffer is rejected."
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
153 (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
154 (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
155 (with-current-buffer buffer
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
156 (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
157 ;; Optionally reject some buffers.
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
158 (if extra-test-exclusive
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
159 (funcall extra-test-exclusive)
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
160 t)
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
161 ;; Optionally accept some other buffers.
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
162 (and extra-test-inclusive
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
163 (funcall extra-test-inclusive))))))
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
164
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
165 (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
166 extra-test-inclusive
58625
31d0b9422d7b simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents: 58354
diff changeset
167 extra-test-exclusive)
31d0b9422d7b simple.el (next-error-buffer-p): allow for inclusive and
Teodor Zlatanov <tzz@lifelogs.com>
parents: 58354
diff changeset
168 "Return 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
169 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
170 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
171
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
172 The function EXTRA-TEST-INCLUSIVE, if non-nil, is called in each buffers
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
173 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
174 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
175
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
176 The function EXTRA-TEST-EXCLUSIVE, 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
177 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
178 that buffer is rejected."
56862
adba247afe3f * simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents: 56861
diff changeset
179 (or
adba247afe3f * simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents: 56861
diff changeset
180 ;; 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
181 (let ((window-buffers
adba247afe3f * simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents: 56861
diff changeset
182 (delete-dups
adba247afe3f * simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents: 56861
diff changeset
183 (delq nil (mapcar (lambda (w)
adba247afe3f * simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents: 56861
diff changeset
184 (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
185 (window-buffer w)
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
186 avoid-current
58951
c7ebd794182b (next-error-buffer-p, next-error-find-buffer): Doc fix.
Juri Linkov <juri@jurta.org>
parents: 58917
diff changeset
187 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
188 (window-buffer w)))
adba247afe3f * simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents: 56861
diff changeset
189 (window-list))))))
adba247afe3f * simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents: 56861
diff changeset
190 (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
191 (car window-buffers)))
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
192 ;; 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
193 (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
194 (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
195 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
196 next-error-last-buffer)
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
197 ;; 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
198 (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
199 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
200 (current-buffer))
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
201 ;; 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
202 (let ((buffers (buffer-list)))
adba247afe3f * simple.el (next-error-find-buffer): Move the rule
Juri Linkov <juri@jurta.org>
parents: 56861
diff changeset
203 (while (and buffers
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
204 (not (next-error-buffer-p
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
205 (car buffers) avoid-current
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
206 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
207 (setq buffers (cdr buffers)))
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
208 (car buffers))
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
209 ;; 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
210 ;; even despite AVOID-CURRENT.
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
211 (and avoid-current
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
212 (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
213 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
214 (progn
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
215 (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
216 (current-buffer)))
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
217 ;; 6. Give up.
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
218 (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
219
56861
2e59d9187762 (next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents: 56761
diff changeset
220 (defun next-error (&optional arg reset)
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
221 "Visit next next-error message and corresponding source code.
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
222
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
223 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
224 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
225
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
226 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
227 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
228 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
229 and start at the first error.
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
230
55425
1acbf23561f5 (next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 55294
diff changeset
231 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
232
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
233 \\[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
234 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
235 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
236 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
237 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
238 `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
239 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
240 \\[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
241 in the current frame.
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
242
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
243 Once \\[next-error] has chosen the buffer for error messages,
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
244 it stays with that buffer until you use it in some other buffer which
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
245 uses Compilation mode or Compilation Minor mode.
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
246
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
247 See variables `compilation-parse-errors-function' and
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
248 \`compilation-error-regexp-alist' for customization ideas."
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
249 (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
250 (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
251 (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
252 ;; 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
253 (with-current-buffer next-error-last-buffer
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
254 (funcall next-error-function (prefix-numeric-value arg) reset))))
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
255
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
256 (defalias 'goto-next-locus 'next-error)
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
257 (defalias 'next-match 'next-error)
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
258
56861
2e59d9187762 (next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents: 56761
diff changeset
259 (defun previous-error (&optional n)
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
260 "Visit previous next-error message and corresponding source code.
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
261
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
262 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
263 forwards, if negative).
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
264
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
265 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
266 (interactive "p")
56861
2e59d9187762 (next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents: 56761
diff changeset
267 (next-error (- (or n 1))))
2e59d9187762 (next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents: 56761
diff changeset
268
2e59d9187762 (next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents: 56761
diff changeset
269 (defun first-error (&optional n)
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
270 "Restart at the first error.
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
271 Visit corresponding source code.
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
272 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
273 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
274 (interactive "p")
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
275 (next-error n t))
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
276
56861
2e59d9187762 (next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents: 56761
diff changeset
277 (defun next-error-no-select (&optional n)
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
278 "Move point to the next error in the next-error buffer and highlight match.
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
279 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
280 backwards, if negative).
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
281 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
282 select the source buffer."
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
283 (interactive "p")
56863
c8bb5aca0581 * simple.el (next-error): New defgroup and defface.
Juri Linkov <juri@jurta.org>
parents: 56862
diff changeset
284 (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
285 (next-error n))
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
286 (pop-to-buffer next-error-last-buffer))
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
287
56861
2e59d9187762 (next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents: 56761
diff changeset
288 (defun previous-error-no-select (&optional n)
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
289 "Move point to the previous error in the next-error buffer and highlight match.
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
290 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
291 forwards, if negative).
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
292 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
293 select the source buffer."
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
294 (interactive "p")
56861
2e59d9187762 (next-error, previous-error, first-error)
Juri Linkov <juri@jurta.org>
parents: 56761
diff changeset
295 (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
296
56918
2e166bd5683b (next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents: 56863
diff changeset
297 ;;; 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
298 (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
299
56926
f8e248e9a717 Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents: 56918
diff changeset
300 (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
301 "Minor mode for compilation, occur and diff modes.
56926
f8e248e9a717 Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents: 56918
diff changeset
302 When turned on, cursor motion in the compilation, grep, occur or diff
f8e248e9a717 Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents: 56918
diff changeset
303 buffer causes automatic display of the corresponding source code
f8e248e9a717 Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents: 56918
diff changeset
304 location."
61276
31cb9b5b8d41 (next-error-follow-minor-mode): Specify :group.
Lute Kamstra <lute@gnu.org>
parents: 61232
diff changeset
305 :group 'next-error :init-value " Fol"
56943
e57b96a4469e (next-error-follow-minor-mode): Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents: 56926
diff changeset
306 (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
307 (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
308 (add-hook 'post-command-hook 'next-error-follow-mode-post-command-hook nil t)
2e166bd5683b (next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents: 56863
diff changeset
309 (make-variable-buffer-local 'next-error-follow-last-line)))
2e166bd5683b (next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents: 56863
diff changeset
310
2e166bd5683b (next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents: 56863
diff changeset
311 ;;; 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
312 ;;; 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
313 (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
314 (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
315 (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
316 (condition-case nil
2e166bd5683b (next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents: 56863
diff changeset
317 (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
318 (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
319 (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
320 (error t))))
2e166bd5683b (next-error-follow-mode, next-error-follow-mode-post-command-hook):
Eli Zaretskii <eliz@gnu.org>
parents: 56863
diff changeset
321
56863
c8bb5aca0581 * simple.el (next-error): New defgroup and defface.
Juri Linkov <juri@jurta.org>
parents: 56862
diff changeset
322
55066
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
323 ;;;
057613675a0b From: Teodor Zlatanov <tzz@lifelogs.com>
Kim F. Storm <storm@cua.dk>
parents: 54910
diff changeset
324
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
325 (defun fundamental-mode ()
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
326 "Major mode not specialized for anything in particular.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
327 Other major modes are defined by comparison with this one."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
328 (interactive)
57146
942b8e28d21a (fundamental-mode): Run `after-change-major-mode-hook'.
Luc Teirlinck <teirllm@auburn.edu>
parents: 57069
diff changeset
329 (kill-all-local-variables)
942b8e28d21a (fundamental-mode): Run `after-change-major-mode-hook'.
Luc Teirlinck <teirllm@auburn.edu>
parents: 57069
diff changeset
330 (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
331
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
332 ;; Making and deleting lines.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
333
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
334 (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
335 "Insert a newline, and move to left margin of the new line if it's blank.
42128
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
336 If `use-hard-newlines' is non-nil, the newline is marked with the
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
337 text-property `hard'.
31978
3a5e22f4cd99 (read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31573
diff changeset
338 With ARG, insert that many newlines.
42128
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
339 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
340 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
341 (interactive "*P")
13137
a83a1515fd9b (newline): Call barf-if-buffer-read-only.
Richard M. Stallman <rms@gnu.org>
parents: 12975
diff changeset
342 (barf-if-buffer-read-only)
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
343 ;; 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
344 ;; 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
345 ;; 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
346 ;; the end of the previous line.
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
347 (let ((flag (and (not (bobp))
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
348 (bolp)
17214
15e868121a15 (newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents: 17133
diff changeset
349 ;; 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
350 ;; 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
351 (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
352 (not before-change-functions)
16417
fb6785d0c256 (newline): Use buffer-has-markers-at.
Richard M. Stallman <rms@gnu.org>
parents: 16408
diff changeset
353 ;; Make sure there are no markers here.
fb6785d0c256 (newline): Use buffer-has-markers-at.
Richard M. Stallman <rms@gnu.org>
parents: 16408
diff changeset
354 (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
355 (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
356 ;; 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
357 ;; 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
358 (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
359 (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
360 (or (eobp)
15e868121a15 (newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents: 17133
diff changeset
361 (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
362 ;; 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
363 (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
364 ;; 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
365 (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
366 ;; 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
367 (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
368 ;; 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
369 ;; 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
370 (< (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
371 (- (point) 2))))
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
372 (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
373 (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
374 (beforepos (point)))
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
375 (if flag (backward-char 1))
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
376 ;; 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
377 ;; 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
378 (let ((last-command-char ?\n)
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
379 ;; 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
380 ;; 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
381 ;; 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
382 (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
383 (unwind-protect
9e7727cdbb68 (newline): Put point at right place if insert gets error.
Richard M. Stallman <rms@gnu.org>
parents: 12355
diff changeset
384 (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
385 ;; 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
386 (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
387 ;; 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
388 ;; 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
389 ;; thinks he inserted.
b787b88cc575 (newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents: 21222
diff changeset
390
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
391 ;; Mark the newline(s) `hard'.
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
392 (if use-hard-newlines
21459
b787b88cc575 (newline): Mark as hard the newline that was just
Karl Heuer <kwzh@gnu.org>
parents: 21222
diff changeset
393 (set-hard-newline-properties
16018
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
394 (- (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
395 ;; 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
396 ;; 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
397 (or flag
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
398 (save-excursion
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
399 (goto-char beforepos)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
400 (beginning-of-line)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
401 (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
402 (> (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
403 (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
404 ;; 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
405 ;; 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
406 ;; 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
407 (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
408 (move-to-left-margin nil t)))
10863
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
409 nil)
8e6b25e41a99 (newline): Moved from cmds.c. Indents last
Boris Goldowsky <boris@gnu.org>
parents: 10854
diff changeset
410
16018
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
411 (defun set-hard-newline-properties (from to)
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
412 (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
413 (put-text-property from to 'hard 't)
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
414 ;; 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
415 (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
416 (put-text-property from (point) 'rear-nonsticky
9a12ac7707c9 (set-hard-newline-properties): New fn.
Richard M. Stallman <rms@gnu.org>
parents: 15988
diff changeset
417 (cons 'hard sticky)))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
418
55425
1acbf23561f5 (next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 55294
diff changeset
419 (defun open-line (n)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
420 "Insert a newline and leave point before it.
10813
bccf0295c66e (open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents: 10805
diff changeset
421 If there is a fill prefix and/or a left-margin, insert them on the new line
11324
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
422 if the line would have been blank.
1063
25b929c06f83 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1039
diff changeset
423 With arg N, insert N newlines."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
424 (interactive "*p")
1063
25b929c06f83 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1039
diff changeset
425 (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
426 (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
427 (loc (point))
e334380bbb2c (next-line): Don't let `newline' expand abbrevs.
Gerd Moellmann <gerd@gnu.org>
parents: 35346
diff changeset
428 ;; 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
429 (abbrev-mode nil))
55425
1acbf23561f5 (next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 55294
diff changeset
430 (newline n)
11324
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
431 (goto-char loc)
55425
1acbf23561f5 (next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 55294
diff changeset
432 (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
433 (cond ((bolp)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
434 (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
435 (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
436 (forward-line 1)
55425
1acbf23561f5 (next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 55294
diff changeset
437 (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
438 (goto-char loc)
3190c85854b6 (newline): Don't indent afterward if at page sep line.
Richard M. Stallman <rms@gnu.org>
parents: 11318
diff changeset
439 (end-of-line)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
440
49032
5dbb47300a5b (split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents: 48984
diff changeset
441 (defun split-line (&optional arg)
5dbb47300a5b (split-line): If present, copy fill-prefix from
Kim F. Storm <storm@cua.dk>
parents: 48984
diff changeset
442 "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
443 If the current line starts with `fill-prefix', insert it on the new
55425
1acbf23561f5 (next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 55294
diff changeset
444 line as well. With prefix ARG, don't insert fill-prefix on new line.
1acbf23561f5 (next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 55294
diff changeset
445
1acbf23561f5 (next-error): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 55294
diff changeset
446 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
447 (interactive "*P")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
448 (skip-chars-forward " \t")
49066
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
449 (let* ((col (current-column))
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
450 (pos (point))
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
451 ;; 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
452 (prefix (cond ((stringp arg) arg)
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
453 (arg nil)
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
454 (t fill-prefix)))
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
455 ;; Does this line start with it?
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
456 (have-prfx (and prefix
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
457 (save-excursion
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
458 (beginning-of-line)
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
459 (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
460 (newline 1)
49066
d00c13d69d31 (split-line): Clean up implementation.
Richard M. Stallman <rms@gnu.org>
parents: 49032
diff changeset
461 (if have-prfx (insert-and-inherit prefix))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
462 (indent-to col 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
463 (goto-char pos)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
464
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
465 (defun delete-indentation (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
466 "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
467 If there is a fill prefix, delete it from the beginning of this line.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
468 With argument, join this line to following line."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
469 (interactive "*P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
470 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
471 (if arg (forward-line 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
472 (if (eq (preceding-char) ?\n)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
473 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
474 (delete-region (point) (1- (point)))
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
475 ;; If the second line started with the fill prefix,
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
476 ;; delete the prefix.
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
477 (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
478 (<= (+ (point) (length fill-prefix)) (point-max))
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
479 (string= fill-prefix
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
480 (buffer-substring (point)
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
481 (+ (point) (length fill-prefix)))))
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
482 (delete-region (point) (+ (point) (length fill-prefix))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
483 (fixup-whitespace))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
484
24078
4de23887487f (join-line): New alias.
Dave Love <fx@gnu.org>
parents: 24028
diff changeset
485 (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
486
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
487 (defun delete-blank-lines ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
488 "On blank line, delete all surrounding blank lines, leaving just one.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
489 On isolated blank line, delete that one.
7817
d729f75fff04 (delete-blank-lines): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 7762
diff changeset
490 On nonblank line, delete any immediately following blank lines."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
491 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
492 (let (thisblank singleblank)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
493 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
494 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
495 (setq thisblank (looking-at "[ \t]*$"))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
496 ;; Set singleblank if there is just one blank line here.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
497 (setq singleblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
498 (and thisblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
499 (not (looking-at "[ \t]*\n[ \t]*$"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
500 (or (bobp)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
501 (progn (forward-line -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
502 (not (looking-at "[ \t]*$")))))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
503 ;; Delete preceding blank lines, and this one too if it's the only one.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
504 (if thisblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
505 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
506 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
507 (if singleblank (forward-line 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
508 (delete-region (point)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
509 (if (re-search-backward "[^ \t\n]" nil t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
510 (progn (forward-line 1) (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
511 (point-min)))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
512 ;; Delete following blank lines, unless the current line is blank
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
513 ;; and there are no following blank lines.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
514 (if (not (and thisblank singleblank))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
515 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
516 (end-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
517 (forward-line 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
518 (delete-region (point)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
519 (if (re-search-forward "[^ \t\n]" nil t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
520 (progn (beginning-of-line) (point))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
521 (point-max)))))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
522 ;; Handle the special case where point is followed by newline and eob.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
523 ;; Delete the line, leaving point at eob.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
524 (if (looking-at "^[ \t]*\n\\'")
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
525 (delete-region (point) (point-max)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
526
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
527 (defun delete-trailing-whitespace ()
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
528 "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
529 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
530 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
531 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
532 (interactive "*")
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
533 (save-match-data
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
534 (save-excursion
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
535 (goto-char (point-min))
34141
799f637fbc35 (delete-trailing-whitespace): Don't delete newlines too.
Miles Bader <miles@gnu.org>
parents: 34101
diff changeset
536 (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
537 (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
538 ;; 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
539 (save-match-data
08dafe901c44 (delete-trailing-whitespace): Save match data
Gerd Moellmann <gerd@gnu.org>
parents: 38432
diff changeset
540 (if (looking-at ".*\f")
08dafe901c44 (delete-trailing-whitespace): Save match data
Gerd Moellmann <gerd@gnu.org>
parents: 38432
diff changeset
541 (goto-char (match-end 0))))
34619
237139766bdc (delete-trailing-whitespace): Remove extraneous let.
Miles Bader <miles@gnu.org>
parents: 34570
diff changeset
542 (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
543
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
544 (defun newline-and-indent ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
545 "Insert a newline, then indent according to major mode.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
546 Indentation is done using the value of `indent-line-function'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
547 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
548 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
549 column specified by the function `current-left-margin'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
550 (interactive "*")
34462
6a7373de926f (delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents: 34443
diff changeset
551 (delete-horizontal-space t)
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
552 (newline)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
553 (indent-according-to-mode))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
554
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
555 (defun reindent-then-newline-and-indent ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
556 "Reindent current line, insert newline, then indent the new line.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
557 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
558 which means calling the current value of `indent-line-function'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
559 In programming language modes, this is the same as TAB.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
560 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
561 column specified by the function `current-left-margin'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
562 (interactive "*")
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
563 (let ((pos (point)))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
564 ;; 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
565 ;; 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
566 (newline)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
567 (save-excursion
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
568 (goto-char pos)
52944
ae9d36444079 (reindent-then-newline-and-indent): Delete space *after*
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52566
diff changeset
569 (indent-according-to-mode)
ae9d36444079 (reindent-then-newline-and-indent): Delete space *after*
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52566
diff changeset
570 (delete-horizontal-space t))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
571 (indent-according-to-mode)))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
572
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
573 (defun quoted-insert (arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
574 "Read next input character and insert it.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
575 This is useful for inserting control characters.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
576
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
577 If the first character you type after this command is an octal digit,
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
578 you should type a sequence of octal digits which specify a character code.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
579 Any nondigit terminates the sequence. If the terminator is a RET,
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
580 it is discarded; any other terminator is used itself as input.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
581 The variable `read-quoted-char-radix' specifies the radix for this feature;
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
582 set it to 10 or 16 to use decimal or hex instead of octal.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
583
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
584 In overwrite mode, this function inserts the character anyway, and
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
585 does not handle octal digits specially. This means that if you use
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
586 overwrite as your normal editing mode, you can use this function to
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
587 insert characters when necessary.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
588
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
589 In binary overwrite mode, this function does overwrite, and octal
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
590 digits are interpreted as a character code. This is intended to be
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
591 useful for editing binary files."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
592 (interactive "*p")
48234
1ae575cd625c (quoted-insert): Bind translation-table-for-input, not
Dave Love <fx@gnu.org>
parents: 48180
diff changeset
593 (let* ((char (let (translation-table-for-input)
48180
9b71fc12ed85 (quoted-insert): Bind keyboard-translate-table around
Dave Love <fx@gnu.org>
parents: 48013
diff changeset
594 (if (or (not overwrite-mode)
9b71fc12ed85 (quoted-insert): Bind keyboard-translate-table around
Dave Love <fx@gnu.org>
parents: 48013
diff changeset
595 (eq overwrite-mode 'overwrite-mode-binary))
9b71fc12ed85 (quoted-insert): Bind keyboard-translate-table around
Dave Love <fx@gnu.org>
parents: 48013
diff changeset
596 (read-quoted-char)
9b71fc12ed85 (quoted-insert): Bind keyboard-translate-table around
Dave Love <fx@gnu.org>
parents: 48013
diff changeset
597 (read-char)))))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
598 ;; Assume character codes 0240 - 0377 stand for characters in some
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
599 ;; single-byte character set, and convert them to Emacs
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
600 ;; characters.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
601 (if (and enable-multibyte-characters
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
602 (>= char ?\240)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
603 (<= char ?\377))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
604 (setq char (unibyte-char-to-multibyte char)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
605 (if (> arg 0)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
606 (if (eq overwrite-mode 'overwrite-mode-binary)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
607 (delete-char arg)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
608 (while (> arg 0)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
609 (insert-and-inherit char)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
610 (setq arg (1- arg)))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
611
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
612 (defun forward-to-indentation (&optional arg)
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
613 "Move forward ARG lines and position at first nonblank character."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
614 (interactive "p")
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
615 (forward-line (or arg 1))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
616 (skip-chars-forward " \t"))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
617
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
618 (defun backward-to-indentation (&optional arg)
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
619 "Move backward ARG lines and position at first nonblank character."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
620 (interactive "p")
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
621 (forward-line (- (or arg 1)))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
622 (skip-chars-forward " \t"))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
623
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
624 (defun back-to-indentation ()
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
625 "Move point to the first non-whitespace character on this line."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
626 (interactive)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
627 (beginning-of-line 1)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
628 (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
629 ;; 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
630 (backward-prefix-chars))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
631
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
632 (defun fixup-whitespace ()
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
633 "Fixup white space between objects around point.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
634 Leave one space or none, according to the context."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
635 (interactive "*")
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
636 (save-excursion
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
637 (delete-horizontal-space)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
638 (if (or (looking-at "^\\|\\s)")
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
639 (save-excursion (forward-char -1)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
640 (looking-at "$\\|\\s(\\|\\s'")))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
641 nil
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
642 (insert ?\ ))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
643
34462
6a7373de926f (delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents: 34443
diff changeset
644 (defun delete-horizontal-space (&optional backward-only)
6a7373de926f (delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents: 34443
diff changeset
645 "Delete all spaces and tabs around point.
6a7373de926f (delete-horizontal-space): Add BACKWARD-ONLY parameter.
Miles Bader <miles@gnu.org>
parents: 34443
diff changeset
646 If BACKWARD-ONLY is non-nil, only delete spaces before point."
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
647 (interactive "*")
37791
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
648 (let ((orig-pos (point)))
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
649 (delete-region
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
650 (if backward-only
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
651 orig-pos
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
652 (progn
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
653 (skip-chars-forward " \t")
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
654 (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
655 (progn
37791
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
656 (skip-chars-backward " \t")
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
657 (constrain-to-field nil orig-pos)))))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
658
59598
9782a4d3aef5 (just-one-space): Make arg optional.
Kim F. Storm <storm@cua.dk>
parents: 59567
diff changeset
659 (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
660 "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
661 (interactive "*p")
37791
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
662 (let ((orig-pos (point)))
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
663 (skip-chars-backward " \t")
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
664 (constrain-to-field nil orig-pos)
59598
9782a4d3aef5 (just-one-space): Make arg optional.
Kim F. Storm <storm@cua.dk>
parents: 59567
diff changeset
665 (dotimes (i (or n 1))
59567
638fd0a9f545 (just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents: 59486
diff changeset
666 (if (= (following-char) ?\ )
638fd0a9f545 (just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents: 59486
diff changeset
667 (forward-char 1)
638fd0a9f545 (just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents: 59486
diff changeset
668 (insert ?\ )))
37791
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
669 (delete-region
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
670 (point)
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
671 (progn
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
672 (skip-chars-forward " \t")
5bd4843858ae (delete-horizontal-space, just-one-space): Use `constrain-to-field'
Miles Bader <miles@gnu.org>
parents: 37300
diff changeset
673 (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
674
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
675 (defun beginning-of-buffer (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
676 "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
677 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
678 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
679
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
680 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
681 of the accessible part of the buffer.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
682
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
683 Don't use this command in Lisp programs!
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
684 \(goto-char (point-min)) is faster and avoids clobbering the mark."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
685 (interactive "P")
58961
2a281af9d3ad (inhibit-mark-movement): Remove defvar.
Kim F. Storm <storm@cua.dk>
parents: 58951
diff changeset
686 (or (consp arg)
58917
44dfc09c6b67 * simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents: 58754
diff changeset
687 (and transient-mark-mode mark-active)
44dfc09c6b67 * simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents: 58754
diff changeset
688 (push-mark))
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
689 (let ((size (- (point-max) (point-min))))
56432
af62749c9497 (inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents: 56378
diff changeset
690 (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
691 (+ (point-min)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
692 (if (> size 10000)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
693 ;; Avoid overflow for large buffer sizes!
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
694 (* (prefix-numeric-value arg)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
695 (/ size 10))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
696 (/ (+ 10 (* size (prefix-numeric-value arg))) 10)))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
697 (point-min))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
698 (if arg (forward-line 1)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
699
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
700 (defun end-of-buffer (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
701 "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
702 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
703 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
704
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
705 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
706 of the accessible part of the buffer.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
707
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
708 Don't use this command in Lisp programs!
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
709 \(goto-char (point-max)) is faster and avoids clobbering the mark."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
710 (interactive "P")
58961
2a281af9d3ad (inhibit-mark-movement): Remove defvar.
Kim F. Storm <storm@cua.dk>
parents: 58951
diff changeset
711 (or (consp arg)
58917
44dfc09c6b67 * simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents: 58754
diff changeset
712 (and transient-mark-mode mark-active)
44dfc09c6b67 * simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents: 58754
diff changeset
713 (push-mark))
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
714 (let ((size (- (point-max) (point-min))))
56432
af62749c9497 (inhibit-mark-movement): New defvar.
Kim F. Storm <storm@cua.dk>
parents: 56378
diff changeset
715 (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
716 (- (point-max)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
717 (if (> size 10000)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
718 ;; Avoid overflow for large buffer sizes!
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
719 (* (prefix-numeric-value arg)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
720 (/ size 10))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
721 (/ (* size (prefix-numeric-value arg)) 10)))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
722 (point-max))))
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
723 ;; 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
724 ;; 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
725 (cond (arg (forward-line 1))
39743
b6933b0f1ef2 (end-of-buffer): Fix code scrolling specially
Gerd Moellmann <gerd@gnu.org>
parents: 39612
diff changeset
726 ((> (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
727 ;; 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
728 ;; 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
729 (overlay-recenter (point))
bcd25953e4cf (end-of-buffer): Use window-end to find the window end
Gerd Moellmann <gerd@gnu.org>
parents: 26201
diff changeset
730 (recenter -3))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
731
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
732 (defun mark-whole-buffer ()
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
733 "Put point at beginning and mark at end of buffer.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
734 You probably should not use this function in Lisp programs;
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
735 it is usually a mistake for a Lisp function to use any subroutine
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
736 that uses or sets the mark."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
737 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
738 (push-mark (point))
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
739 (push-mark (point-max) nil t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
740 (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
741
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
742
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
743 ;; Counting lines, one way or another.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
744
60405
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
745 (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
746 "Goto line ARG, counting from line 1 at beginning of buffer.
60744
660b45682e47 (goto-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 60664
diff changeset
747 Normally, move point in the current buffer.
660b45682e47 (goto-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 60664
diff changeset
748 With just \\[universal-argument] as argument, move point in the most recently
660b45682e47 (goto-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 60664
diff changeset
749 displayed other buffer, and switch to it. When called from Lisp code,
660b45682e47 (goto-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 60664
diff changeset
750 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
751
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
752 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
753 (interactive
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
754 (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
755 (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
756 ;; 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
757 (let* ((default
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
758 (save-excursion
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
759 (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
760 (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
761 (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
762 (point)
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
763 (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
764 (point))))))
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
765 ;; 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
766 (buffer
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
767 (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
768 (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
769 (buffer-prompt
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
770 (if buffer
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
771 (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
772 "")))
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
773 ;; 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
774 (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
775 "Goto line%s: ")
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
776 buffer-prompt
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
777 default)
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
778 nil nil t
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
779 'minibuffer-history
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
780 default)
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
781 buffer))))
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
782 ;; 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
783 (if buffer
489c6114d10c (goto-line): Use a number at point as the default.
Richard M. Stallman <rms@gnu.org>
parents: 60176
diff changeset
784 (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
785 (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
786 (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
787 ;; Move to the specified line number in that buffer.
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
788 (save-restriction
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
789 (widen)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
790 (goto-char 1)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
791 (if (eq selective-display t)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
792 (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
793 (forward-line (1- arg)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
794
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
795 (defun count-lines-region (start end)
3591
507f64624555 Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents: 3487
diff changeset
796 "Print number of lines and characters in the region."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
797 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
798 (message "Region has %d lines, %d characters"
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
799 (count-lines start end) (- end start)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
800
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
801 (defun what-line ()
12939
1fc5a2981547 (what-line): Print narrowed linenum with full buffer num.
Richard M. Stallman <rms@gnu.org>
parents: 12893
diff changeset
802 "Print the current buffer line number and narrowed line number of point."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
803 (interactive)
58754
b41534d7c63c (blink-matching-open): Obey syntax-table text properties.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58625
diff changeset
804 (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
805 (n (line-number-at-pos)))
53677
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
806 (if (= start 1)
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
807 (message "Line %d" n)
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
808 (save-excursion
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
809 (save-restriction
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
810 (widen)
54058
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
811 (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
812 (+ 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
813
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
814 (defun count-lines (start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
815 "Return number of lines between START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
816 This is usually the number of newlines between them,
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
817 but can be one more if START is not equal to END
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
818 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
819 (save-excursion
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
820 (save-restriction
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
821 (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
822 (goto-char (point-min))
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
823 (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
824 (save-match-data
2421
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
825 (let ((done 0))
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
826 (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
827 (setq done (+ 40 done)))
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
828 (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
829 (setq done (+ 1 done)))
5151
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
830 (goto-char (point-max))
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
831 (if (and (/= start end)
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
832 (not (bolp)))
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
833 (1+ done)
9554
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
834 done)))
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
835 (- (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
836
53839
be1da5092aa4 (line-number-at-pos): Rename from line-at-pos.
Kim F. Storm <storm@cua.dk>
parents: 53767
diff changeset
837 (defun line-number-at-pos (&optional pos)
53677
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
838 "Return (narrowed) buffer line number at position POS.
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
839 If POS is nil, use current buffer location."
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
840 (let ((opoint (or pos (point))) start)
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
841 (save-excursion
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
842 (goto-char (point-min))
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
843 (setq start (point))
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
844 (goto-char opoint)
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
845 (forward-line 0)
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
846 (1+ (count-lines start (point))))))
347987843452 (line-at-pos): New defun.
Kim F. Storm <storm@cua.dk>
parents: 53411
diff changeset
847
16999
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
848 (defun what-cursor-position (&optional detail)
b22c4cee0207 (kill-forward-chars, kill-backward-chars): Pay
Karl Heuer <kwzh@gnu.org>
parents: 16957
diff changeset
849 "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
850 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
851 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
852
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
853 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
854 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
855 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
856 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
857 byte, just \"...\" is shown.
23963
c242e2dc93a9 (what-cursor-position): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 23944
diff changeset
858
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
859 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
860 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
861 (interactive "P")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
862 (let* ((char (following-char))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
863 (beg (point-min))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
864 (end (point-max))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
865 (pos (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
866 (total (buffer-size))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
867 (percent (if (> total 50000)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
868 ;; Avoid overflow from multiplying by 100!
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
869 (/ (+ (/ total 200) (1- pos)) (max (/ total 100) 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
870 (/ (+ (/ total 2) (* 100 (1- pos))) (max total 1))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
871 (hscroll (if (= (window-hscroll) 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
872 ""
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
873 (format " Hscroll=%d" (window-hscroll))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
874 (col (current-column)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
875 (if (= pos end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
876 (if (or (/= beg 1) (/= end (1+ total)))
27477
8a7e3bcab064 (what-cursor-position): Change formatting of
Gerd Moellmann <gerd@gnu.org>
parents: 27302
diff changeset
877 (message "point=%d of %d (%d%%) <%d - %d> column %d %s"
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
878 pos total percent beg end col hscroll)
27477
8a7e3bcab064 (what-cursor-position): Change formatting of
Gerd Moellmann <gerd@gnu.org>
parents: 27302
diff changeset
879 (message "point=%d of %d (%d%%) column %d %s"
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
880 pos total percent col hscroll))
24398
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
881 (let ((coding buffer-file-coding-system)
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
882 encoded encoding-msg)
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
883 (if (or (not coding)
0f92ac490b66 * simple.el (what-cursor-position): To show the character's
Kenichi Handa <handa@m17n.org>
parents: 24372
diff changeset
884 (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
885 (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
886 (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
887 (setq encoding-msg
f9e613360d62 (what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents: 24419
diff changeset
888 (format "(0%o, %d, 0x%x, invalid)" char char char))
f9e613360d62 (what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents: 24419
diff changeset
889 (setq encoded (and (>= char 128) (encode-coding-char char coding)))
f9e613360d62 (what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents: 24419
diff changeset
890 (setq encoding-msg
f9e613360d62 (what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents: 24419
diff changeset
891 (if encoded
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
892 (format "(0%o, %d, 0x%x, file %s)"
24508
f9e613360d62 (what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents: 24419
diff changeset
893 char char char
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
894 (if (> (length encoded) 1)
24508
f9e613360d62 (what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents: 24419
diff changeset
895 "..."
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
896 (encoded-string-description encoded coding)))
24508
f9e613360d62 (what-cursor-position): Don't cause error when point
Kenichi Handa <handa@m17n.org>
parents: 24419
diff changeset
897 (format "(0%o, %d, 0x%x)" char char char))))
23944
b5617ede97a8 (what-cursor-position): Print character encoding also.
Richard M. Stallman <rms@gnu.org>
parents: 23864
diff changeset
898 (if detail
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
899 ;; 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
900 (describe-char (point)))
28896
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
901 (if (or (/= beg 1) (/= end (1+ total)))
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
902 (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
903 (if (< char 256)
8063bfbd8b08 (what-cursor-position): Show "(composed)" if the
Kenichi Handa <handa@m17n.org>
parents: 26744
diff changeset
904 (single-key-description char)
8063bfbd8b08 (what-cursor-position): Show "(composed)" if the
Kenichi Handa <handa@m17n.org>
parents: 26744
diff changeset
905 (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
906 encoding-msg pos total percent beg end col hscroll)
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
907 (message "Char: %s %s point=%d of %d (%d%%) column %d %s"
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
908 (if (< char 256)
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
909 (single-key-description char)
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
910 (buffer-substring-no-properties (point) (1+ (point))))
0c70e1541a95 (what-cursor-position): If DETAIL is non-nil, call
Kenichi Handa <handa@m17n.org>
parents: 28703
diff changeset
911 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
912
31978
3a5e22f4cd99 (read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31573
diff changeset
913 (defvar read-expression-map
3a5e22f4cd99 (read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31573
diff changeset
914 (let ((m (make-sparse-keymap)))
3a5e22f4cd99 (read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31573
diff changeset
915 (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
916 (set-keymap-parent m minibuffer-local-map)
3a5e22f4cd99 (read-expression-map): Define more properly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31573
diff changeset
917 m)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
918 "Minibuffer keymap used for reading Lisp expressions.")
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
919
4289
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
920 (defvar read-expression-history nil)
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
921
25702
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
922 (defcustom eval-expression-print-level 4
63022
5e1ac4f79779 (eval-expression-print-level)
Luc Teirlinck <teirllm@auburn.edu>
parents: 62987
diff changeset
923 "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
924 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
925 :group 'lisp
42128
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
926 :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
927 :version "21.1")
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
928
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
929 (defcustom eval-expression-print-length 12
63022
5e1ac4f79779 (eval-expression-print-level)
Luc Teirlinck <teirllm@auburn.edu>
parents: 62987
diff changeset
930 "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
931 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
932 :group 'lisp
42128
fd7c15c52570 (newline): Doc fix.
Dave Love <fx@gnu.org>
parents: 41996
diff changeset
933 :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
934 :version "21.1")
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
935
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
936 (defcustom eval-expression-debug-on-error t
63022
5e1ac4f79779 (eval-expression-print-level)
Luc Teirlinck <teirllm@auburn.edu>
parents: 62987
diff changeset
937 "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
938 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
939 :group 'lisp
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
940 :type 'boolean
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
941 :version "21.1")
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
942
55799
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
943 (defun eval-expression-print-format (value)
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
944 "Format VALUE as a result of evaluated expression.
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
945 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
946 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
947 display the result of expression evaluation."
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
948 (if (and (integerp value)
56005
54d79ab53dd3 (eval-expression-print-format): Don't print additional
Juri Linkov <juri@jurta.org>
parents: 55975
diff changeset
949 (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
950 (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
951 (if (boundp 'edebug-active) edebug-active)))
55799
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
952 (let ((char-string
60007
bfdc24654127 (eval-expression-print-format): Avoid warning about edebug-active.
Richard M. Stallman <rms@gnu.org>
parents: 59996
diff changeset
953 (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
954 (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
955 (prin1-char value))))
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
956 (if char-string
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
957 (format " (0%o, 0x%x) = %s" value value char-string)
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
958 (format " (0%o, 0x%x)" value value)))))
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
959
4289
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
960 ;; We define this, rather than making `eval' interactive,
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
961 ;; 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
962 (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
963 &optional eval-expression-insert-value)
36021
aab41105aef0 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35940
diff changeset
964 "Evaluate EVAL-EXPRESSION-ARG and print value in the echo area.
aab41105aef0 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35940
diff changeset
965 Value is also consed on to front of the variable `values'.
aab41105aef0 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35940
diff changeset
966 Optional argument EVAL-EXPRESSION-INSERT-VALUE, if non-nil, means
aab41105aef0 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35940
diff changeset
967 insert the result into the current buffer instead of printing it in
aab41105aef0 (eval-expression): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35940
diff changeset
968 the echo area."
4886
20e345c97e28 (eval-expression, edit-and-eval-command): Let
Brian Fox <bfox@gnu.org>
parents: 4869
diff changeset
969 (interactive
5068
9a42f23df119 (eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents: 4894
diff changeset
970 (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
971 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
972 'read-expression-history)
9f6b375ce842 (eval-expression): Prefix arg means insert value in current buffer.
Richard M. Stallman <rms@gnu.org>
parents: 19362
diff changeset
973 current-prefix-arg))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
974
27302
1cb6c18c3163 (eval-expression): Don't bind debug-on-error if
Gerd Moellmann <gerd@gnu.org>
parents: 27298
diff changeset
975 (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
976 (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
977 (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
978 ;; 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
979 ;; 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
980 (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
981 (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
982 (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
983 ;; 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
984 ;; 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
985 (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
986 (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
987
25702
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
988 (let ((print-length eval-expression-print-length)
2b96c6e05f23 (eval-expression-print-level): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 25490
diff changeset
989 (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
990 (if eval-expression-insert-value
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
991 (with-no-warnings
52566
38d8d37f129a (eval-expression): Bind standard-output in to-buffer case.
Richard M. Stallman <rms@gnu.org>
parents: 52464
diff changeset
992 (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
993 (eval-last-sexp-print-value (car values))))
55799
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
994 (prog1
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
995 (prin1 (car values) t)
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
996 (let ((str (eval-expression-print-format (car values))))
85609e1fa661 (eval-expression-print-format): New fun.
Juri Linkov <juri@jurta.org>
parents: 55755
diff changeset
997 (if str (princ str t)))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
998
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
999 (defun edit-and-eval-command (prompt command)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1000 "Prompting with PROMPT, let user edit COMMAND and eval result.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1001 COMMAND is a Lisp expression. Let user edit that expression in
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1002 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
1003 (let ((command
53767
6cac586a9c3d (edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents: 53677
diff changeset
1004 (let ((print-level nil)
6cac586a9c3d (edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents: 53677
diff changeset
1005 (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
1006 (unwind-protect
6cac586a9c3d (edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents: 53677
diff changeset
1007 (read-from-minibuffer prompt
6cac586a9c3d (edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents: 53677
diff changeset
1008 (prin1-to-string command)
6cac586a9c3d (edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents: 53677
diff changeset
1009 read-expression-map t
6cac586a9c3d (edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents: 53677
diff changeset
1010 'command-history)
6cac586a9c3d (edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents: 53677
diff changeset
1011 ;; 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
1012 ;; 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
1013 (if (stringp (car command-history))
6cac586a9c3d (edit-and-eval-command): Bind print-level and
Luc Teirlinck <teirllm@auburn.edu>
parents: 53677
diff changeset
1014 (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
1015
53e092e189c6 (edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents: 9554
diff changeset
1016 ;; 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
1017 ;; 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
1018 (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
1019 (setq command-history (cons command command-history)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1020 (eval command)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1021
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1022 (defun repeat-complex-command (arg)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1023 "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
1024 A complex command is one which used the minibuffer.
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1025 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
1026 The result is executed, repeating the command as changed.
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1027 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
1028 it is added to the front of the command history.
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1029 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
1030 to get different commands to edit and resubmit."
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1031 (interactive "p")
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1032 (let ((elt (nth (1- arg) command-history))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1033 newcmd)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1034 (if elt
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1035 (progn
4821
2c16f99ef5dc (edit-and-eval-command): Let `read-from-minibuffer' manipulate the
Brian Fox <bfox@gnu.org>
parents: 4765
diff changeset
1036 (setq newcmd
16803
3d4a27ecfba9 (repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents: 16723
diff changeset
1037 (let ((print-level nil)
3d4a27ecfba9 (repeat-complex-command): Bind
Richard M. Stallman <rms@gnu.org>
parents: 16723
diff changeset
1038 (minibuffer-history-position arg)
20022
c9ed682ff86f (previous-matching-history-element): No need to bind
Karl Heuer <kwzh@gnu.org>
parents: 19888
diff changeset
1039 (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
1040 (unwind-protect
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
1041 (read-from-minibuffer
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
1042 "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
1043 (cons 'command-history arg))
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
1044
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
1045 ;; 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
1046 ;; 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
1047 ;; evaluable expressions there.
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
1048 (if (stringp (car command-history))
1362c8e5d501 (edit-and-eval-command): Protect command-history.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47464
diff changeset
1049 (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
1050
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
1051 ;; 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
1052 ;; add it to the history.
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
1053 (or (equal newcmd (car command-history))
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
1054 (setq command-history (cons newcmd command-history)))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1055 (eval newcmd))
48984
13c2502ecdc8 (repeat-complex-command): Signal real error on failure.
Richard M. Stallman <rms@gnu.org>
parents: 48628
diff changeset
1056 (if command-history
13c2502ecdc8 (repeat-complex-command): Signal real error on failure.
Richard M. Stallman <rms@gnu.org>
parents: 48628
diff changeset
1057 (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
1058 (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
1059
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1060 (defvar minibuffer-history nil
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1061 "Default minibuffer history list.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1062 This is used for all minibuffer input
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1063 except when an alternate history list is specified.")
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1064 (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
1065 "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
1066 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
1067 they are expressions; otherwise they are strings.
86345e064999 (undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents: 54058
diff changeset
1068 \(That convention is designed to do the right thing fora
86345e064999 (undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents: 54058
diff changeset
1069 recursive uses of the minibuffer.)")
862
46630543d659 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 859
diff changeset
1070 (setq minibuffer-history-variable 'minibuffer-history)
46630543d659 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 859
diff changeset
1071 (setq minibuffer-history-position nil)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1072 (defvar minibuffer-history-search-history nil)
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
1073
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1074 (defvar minibuffer-text-before-history nil
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1075 "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
1076 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
1077 in this use of the minibuffer.")
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1078
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1079 (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
1080
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1081 (defun minibuffer-history-initialize ()
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1082 (setq minibuffer-text-before-history nil))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1083
33683
8fc77111dd98 (minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents: 33352
diff changeset
1084 (defun minibuffer-avoid-prompt (new old)
8fc77111dd98 (minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents: 33352
diff changeset
1085 "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
1086 (constrain-to-field nil (point-max)))
8fc77111dd98 (minibuffer-avoid-prompt): New function.
Miles Bader <miles@gnu.org>
parents: 33352
diff changeset
1087
22257
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
1088 (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
1089 "*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
1090 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
1091 \\[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
1092 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
1093 :type '(repeat variable)
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
1094 :group 'minibuffer)
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
1095
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1096 (defun previous-matching-history-element (regexp n)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1097 "Find the previous history element that matches REGEXP.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1098 \(Previous history elements refer to earlier actions.)
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1099 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
1100 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
1101 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
1102 `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
1103 makes the search case-sensitive.
22257
23e2e03f2bf6 (minibuffer-history-case-insensitive-variables): New var.
Richard M. Stallman <rms@gnu.org>
parents: 22157
diff changeset
1104 See also `minibuffer-history-case-insensitive-variables'."
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1105 (interactive
2681
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
1106 (let* ((enable-recursive-minibuffers t)
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
1107 (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
1108 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
1109 minibuffer-local-map
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
1110 nil
56081
a72ee0aaa7f9 (previous-matching-history-element): Specify a default.
Richard M. Stallman <rms@gnu.org>
parents: 56005
diff changeset
1111 'minibuffer-history-search-history
a72ee0aaa7f9 (previous-matching-history-element): Specify a default.
Richard M. Stallman <rms@gnu.org>
parents: 56005
diff changeset
1112 (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
1113 ;; 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
1114 (list (if (string= regexp "")
11961
b5efbe330c86 (previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 11572
diff changeset
1115 (if minibuffer-history-search-history
b5efbe330c86 (previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 11572
diff changeset
1116 (car minibuffer-history-search-history)
b5efbe330c86 (previous-matching-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 11572
diff changeset
1117 (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
1118 regexp)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1119 (prefix-numeric-value current-prefix-arg))))
32897
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1120 (unless (zerop n)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1121 (if (and (zerop minibuffer-history-position)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1122 (null minibuffer-text-before-history))
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
1123 (setq minibuffer-text-before-history
39612
309d26eb8616 (previous-matching-history-element): Fix misplaced parentheses.
Miles Bader <miles@gnu.org>
parents: 39597
diff changeset
1124 (minibuffer-contents-no-properties)))
32897
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1125 (let ((history (symbol-value minibuffer-history-variable))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1126 (case-fold-search
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1127 (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
1128 ;; On some systems, ignore case for file names.
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1129 (if (memq minibuffer-history-variable
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1130 minibuffer-history-case-insensitive-variables)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1131 t
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1132 ;; Respect the user's setting for case-fold-search:
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1133 case-fold-search)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1134 nil))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1135 prevpos
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1136 match-string
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1137 match-offset
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1138 (pos minibuffer-history-position))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1139 (while (/= n 0)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1140 (setq prevpos pos)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1141 (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
1142 (when (= pos prevpos)
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1143 (error (if (= pos 1)
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
1144 "No later matching history item"
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
1145 "No earlier matching history item")))
32897
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1146 (setq match-string
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1147 (if (eq minibuffer-history-sexp-flag (minibuffer-depth))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1148 (let ((print-level nil))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1149 (prin1-to-string (nth (1- pos) history)))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1150 (nth (1- pos) history)))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1151 (setq match-offset
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1152 (if (< n 0)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1153 (and (string-match regexp match-string)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1154 (match-end 0))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1155 (and (string-match (concat ".*\\(" regexp "\\)") match-string)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1156 (match-beginning 1))))
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1157 (when match-offset
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1158 (setq n (+ n (if (< n 0) 1 -1)))))
32897
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1159 (setq minibuffer-history-position pos)
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1160 (goto-char (point-max))
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
1161 (delete-minibuffer-contents)
32897
99da951a3b7f (previous-matching-history-element):
Miles Bader <miles@gnu.org>
parents: 32507
diff changeset
1162 (insert match-string)
39612
309d26eb8616 (previous-matching-history-element): Fix misplaced parentheses.
Miles Bader <miles@gnu.org>
parents: 39597
diff changeset
1163 (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
1164 (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
1165 next-matching-history-element))
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1166 (setq command-history (cdr command-history))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1167
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1168 (defun next-matching-history-element (regexp n)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1169 "Find the next history element that matches REGEXP.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1170 \(The next history element refers to a more recent action.)
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1171 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
1172 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
1173 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
1174 `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
1175 makes the search case-sensitive."
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1176 (interactive
2681
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
1177 (let* ((enable-recursive-minibuffers t)
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
1178 (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
1179 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
1180 minibuffer-local-map
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
1181 nil
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
1182 'minibuffer-history-search-history
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
1183 (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
1184 ;; 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
1185 (list (if (string= regexp "")
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
1186 (if minibuffer-history-search-history
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
1187 (car minibuffer-history-search-history)
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
1188 (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
1189 regexp)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
1190 (prefix-numeric-value current-prefix-arg))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
1191 (previous-matching-history-element regexp (- n)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1192
32105
f80262435e6c (minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents: 31978
diff changeset
1193 (defvar minibuffer-temporary-goal-position nil)
f80262435e6c (minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents: 31978
diff changeset
1194
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
1195 (defun next-history-element (n)
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
1196 "Insert the next element of the minibuffer history into the minibuffer."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1197 (interactive "p")
10722
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
1198 (or (zerop n)
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1199 (let ((narg (- minibuffer-history-position n))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1200 (minimum (if minibuffer-default -1 0))
24814
4c57b458fa9b (next-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 24798
diff changeset
1201 elt minibuffer-returned-to-present)
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1202 (if (and (zerop minibuffer-history-position)
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1203 (null minibuffer-text-before-history))
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
1204 (setq minibuffer-text-before-history
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
1205 (minibuffer-contents-no-properties)))
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1206 (if (< narg minimum)
23472
d75fa19c5fc0 (next-history-element): Special error message if no default.
Richard M. Stallman <rms@gnu.org>
parents: 23471
diff changeset
1207 (if minibuffer-default
d75fa19c5fc0 (next-history-element): Special error message if no default.
Richard M. Stallman <rms@gnu.org>
parents: 23471
diff changeset
1208 (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
1209 (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
1210 (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
1211 (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
1212 (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
1213 previous-history-element))
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
1214 (let ((prompt-end (minibuffer-prompt-end)))
32105
f80262435e6c (minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents: 31978
diff changeset
1215 (set (make-local-variable 'minibuffer-temporary-goal-position)
f80262435e6c (minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents: 31978
diff changeset
1216 (cond ((<= (point) prompt-end) prompt-end)
f80262435e6c (minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents: 31978
diff changeset
1217 ((eobp) nil)
f80262435e6c (minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents: 31978
diff changeset
1218 (t (point))))))
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1219 (goto-char (point-max))
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
1220 (delete-minibuffer-contents)
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1221 (setq minibuffer-history-position narg)
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1222 (cond ((= narg -1)
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1223 (setq elt minibuffer-default))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1224 ((= narg 0)
19888
45a077538366 (next-history-element):
Richard M. Stallman <rms@gnu.org>
parents: 19514
diff changeset
1225 (setq elt (or minibuffer-text-before-history ""))
24814
4c57b458fa9b (next-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 24798
diff changeset
1226 (setq minibuffer-returned-to-present t)
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1227 (setq minibuffer-text-before-history nil))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1228 (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
1229 (symbol-value minibuffer-history-variable)))))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1230 (insert
24814
4c57b458fa9b (next-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 24798
diff changeset
1231 (if (and (eq minibuffer-history-sexp-flag (minibuffer-depth))
4c57b458fa9b (next-history-element):
Karl Heuer <kwzh@gnu.org>
parents: 24798
diff changeset
1232 (not minibuffer-returned-to-present))
17662
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1233 (let ((print-level nil))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1234 (prin1-to-string elt))
9b1b6974b36f (minibuffer-text-before-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 17613
diff changeset
1235 elt))
32105
f80262435e6c (minibuffer-temporary-goal-position):
Miles Bader <miles@gnu.org>
parents: 31978
diff changeset
1236 (goto-char (or minibuffer-temporary-goal-position (point-max))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1237
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
1238 (defun previous-history-element (n)
1145
e6cefcaba564 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 1135
diff changeset
1239 "Inserts the previous element of the minibuffer history into the minibuffer."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1240 (interactive "p")
859
5f325fbc093d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 858
diff changeset
1241 (next-history-element (- n)))
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
1242
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
1243 (defun next-complete-history-element (n)
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1244 "Get next history element which completes the minibuffer before the point.
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1245 The contents of the minibuffer after the point are deleted, and replaced
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1246 by the new completion."
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
1247 (interactive "p")
1826
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
1248 (let ((point-at-start (point)))
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
1249 (next-matching-history-element
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1250 (concat
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
1251 "^" (regexp-quote (buffer-substring (minibuffer-prompt-end) (point))))
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1252 n)
1826
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
1253 ;; 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
1254 ;; 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
1255 ;; 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
1256 (goto-char point-at-start)))
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
1257
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
1258 (defun previous-complete-history-element (n)
5324
f091cdec77e2 (next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5151
diff changeset
1259 "\
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1260 Get previous history element which completes the minibuffer before the point.
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1261 The contents of the minibuffer after the point are deleted, and replaced
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1262 by the new completion."
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
1263 (interactive "p")
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
1264 (next-complete-history-element (- n)))
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1265
39597
d92e65cccff6 (previous-matching-history-element, next-history-element)
Miles Bader <miles@gnu.org>
parents: 39289
diff changeset
1266 ;; For compatibility with the old subr of the same name.
26054
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1267 (defun minibuffer-prompt-width ()
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1268 "Return the display width of the minibuffer prompt.
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1269 Return 0 if current buffer is not a mini-buffer."
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1270 ;; Return the width of everything before the field at the end of
967019d3cb93 Doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26003
diff changeset
1271 ;; 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
1272 (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
1273
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1274 ;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
1275 (defalias 'advertised-undo 'undo)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1276
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1277 (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
1278 "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
1279 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
1280 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
1281
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1282 (defvar undo-in-region nil
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1283 "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
1284
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1285 (defvar undo-no-redo nil
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1286 "If t, `undo' doesn't go through redo entries.")
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1287
59782
ec7c04e04f71 (undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents: 59701
diff changeset
1288 (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
1289 "Within a run of consecutive undo commands, list remaining to be undone.
ec7c04e04f71 (undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents: 59701
diff changeset
1290 t if we undid all the way to the end of it.")
ec7c04e04f71 (undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents: 59701
diff changeset
1291
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1292 (defun undo (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1293 "Undo some previous changes.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1294 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
1295 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
1296
32899
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
1297 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
1298 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
1299 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
1300 (interactive "*P")
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1301 ;; 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
1302 ;; 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
1303 ;; 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
1304 ;; 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
1305 ;; 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
1306 ;; 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
1307 (let ((modified (buffer-modified-p))
8ffb00332c5f (undo): Pass proper arg to delete-auto-save-file-if-necessary.
Richard M. Stallman <rms@gnu.org>
parents: 3034
diff changeset
1308 (recent-save (recent-auto-save-p)))
54259
86345e064999 (undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents: 54058
diff changeset
1309 ;; 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
1310 ;; 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
1311 ;; 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
1312 (setq this-command 'undo-start)
86345e064999 (undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents: 54058
diff changeset
1313
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
1314 (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
1315 (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
1316 ;; 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
1317 ;; 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
1318 (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
1319 (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
1320 (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
1321 ;; 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
1322 ;; 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
1323 (gethash list undo-equiv-table))))
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1324 (setq undo-in-region
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1325 (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
1326 (if undo-in-region
32899
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
1327 (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
1328 (undo-start))
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
1329 ;; 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
1330 (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
1331 ;; 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
1332 (setq this-command 'undo)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1333 ;; 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
1334 ;; 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
1335 (let ((equiv (gethash pending-undo-list undo-equiv-table)))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1336 (or (eq (selected-window) (minibuffer-window))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1337 (message (if undo-in-region
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1338 (if equiv "Redo in region!" "Undo in region!")
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1339 (if equiv "Redo!" "Undo!"))))
61531
34b31319dc9b (undo): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 61469
diff changeset
1340 (when (and (consp equiv) undo-no-redo)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1341 ;; 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
1342 ;; 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
1343 (while (let ((next (gethash equiv undo-equiv-table)))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1344 (if next (setq equiv next))))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1345 (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
1346 (undo-more
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
1347 (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
1348 (prefix-numeric-value arg)
5e2b0129cfde (undo): Correctly distinguish between numeric and non-numeric prefix
Miles Bader <miles@gnu.org>
parents: 32897
diff changeset
1349 1))
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1350 ;; 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
1351 ;; 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
1352 ;; 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
1353 ;; record to the following undos.
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1354 ;; 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
1355 (puthash buffer-undo-list
d971c29e6cb4 (undo): Record t in undo-equiv-table
Richard M. Stallman <rms@gnu.org>
parents: 61361
diff changeset
1356 (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
1357 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
1358 ;; 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
1359 ;; 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
1360 (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
1361 (prev nil))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1362 (while (car tail)
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1363 (when (integerp (car tail))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1364 (let ((pos (car tail)))
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1365 (if prev
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1366 (setcdr prev (cdr tail))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1367 (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
1368 (setq tail (cdr tail))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1369 (while (car tail)
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1370 (if (eq pos (car tail))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1371 (if prev
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1372 (setcdr prev (cdr tail))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1373 (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
1374 (setq prev tail))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1375 (setq tail (cdr tail)))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1376 (setq tail nil)))
34a21edb136e (undo): Remove positions from buffer-undo-list up to
Gerd Moellmann <gerd@gnu.org>
parents: 39110
diff changeset
1377 (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
1378 ;; 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
1379 ;; so the next command can tell if the buffer was modified in between.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1380 (and modified (not (buffer-modified-p))
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1381 (delete-auto-save-file-if-necessary recent-save))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1382
59127
25e00b2ef82f (next-error-buffer-p): New arg AVOID-CURRENT.
Richard M. Stallman <rms@gnu.org>
parents: 59055
diff changeset
1383 (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
1384 "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
1385 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
1386 (interactive)
59162
ced0821d5f7c (buffer-disable-undo): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 59157
diff changeset
1387 (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
1388 (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
1389
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1390 (defun undo-only (&optional arg)
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1391 "Undo some previous changes.
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1392 Repeat this command to undo more changes.
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1393 A numeric argument serves as a repeat count.
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1394 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
1395 (interactive "*p")
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1396 (let ((undo-no-redo t)) (undo arg)))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1397
22725
6d0f7798f157 (undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22375
diff changeset
1398 (defvar undo-in-progress nil
6d0f7798f157 (undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22375
diff changeset
1399 "Non-nil while performing an undo.
6d0f7798f157 (undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22375
diff changeset
1400 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
1401
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1402 (defun undo-more (count)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1403 "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
1404 Call `undo-start' to get ready to undo recent changes,
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1405 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
1406 (or (listp pending-undo-list)
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
1407 (error (format "No further undo information%s"
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
1408 (if (and transient-mark-mode mark-active)
46647
cdd51b0b1929 (undo, undo-more): Adjust messages when undoing in a region.
Richard M. Stallman <rms@gnu.org>
parents: 46516
diff changeset
1409 " for region" ""))))
22725
6d0f7798f157 (undo-in-progress): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22375
diff changeset
1410 (let ((undo-in-progress t))
59782
ec7c04e04f71 (undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents: 59701
diff changeset
1411 (setq pending-undo-list (primitive-undo count pending-undo-list))
ec7c04e04f71 (undo): Fix the test for continuing a series of undos.
Richard M. Stallman <rms@gnu.org>
parents: 59701
diff changeset
1412 (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
1413 (setq pending-undo-list t))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1414
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1415 ;; Deep copy of a list
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1416 (defun undo-copy-list (list)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1417 "Make a copy of undo list LIST."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1418 (mapcar 'undo-copy-list-1 list))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1419
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1420 (defun undo-copy-list-1 (elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1421 (if (consp elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1422 (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
1423 elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1424
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1425 (defun undo-start (&optional beg end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1426 "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
1427 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
1428 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
1429 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
1430 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
1431 (if (eq buffer-undo-list t)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1432 (error "No undo information in this buffer"))
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1433 (setq pending-undo-list
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1434 (if (and beg end (not (= beg end)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1435 (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
1436 buffer-undo-list)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1437
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1438 (defvar undo-adjusted-markers)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1439
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1440 (defun undo-make-selective-list (start end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1441 "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
1442 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
1443 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
1444 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
1445 we stop and ignore all further elements."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1446 (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
1447 (undo-list (list nil))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1448 undo-adjusted-markers
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1449 some-rejected
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1450 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
1451 (while undo-list-copy
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1452 (setq undo-elt (car undo-list-copy))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1453 (let ((keep-this
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1454 (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
1455 ;; This is a "was unmodified" element.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1456 ;; 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
1457 (not some-rejected))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1458 (t
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1459 (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
1460 (if keep-this
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1461 (progn
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1462 (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
1463 ;; 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
1464 (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
1465 (eq undo-elt nil)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1466 (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
1467 (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
1468 (setq undo-list-copy nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1469 (setq some-rejected t)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1470 (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
1471 (setq delta (undo-delta undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1472
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1473 (when (/= (cdr delta) 0)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1474 (let ((position (car delta))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1475 (offset (cdr delta)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1476
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1477 ;; 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
1478 ;; 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
1479 ;; 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
1480 ;; 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
1481 ;; 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
1482 ;; output
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1483
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1484 (while temp-undo-list
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1485 (setq undo-elt (car temp-undo-list))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1486 (cond ((integerp undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1487 (if (>= undo-elt position)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1488 (setcar temp-undo-list (- undo-elt offset))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1489 ((atom undo-elt) nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1490 ((stringp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1491 ;; (TEXT . POSITION)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1492 (let ((text-pos (abs (cdr undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1493 (point-at-end (< (cdr undo-elt) 0 )))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1494 (if (>= text-pos position)
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1495 (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
1496 (- text-pos offset))))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1497 ((integerp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1498 ;; (BEGIN . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1499 (when (>= (car undo-elt) position)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1500 (setcar undo-elt (- (car undo-elt) offset))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1501 (setcdr undo-elt (- (cdr undo-elt) offset))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1502 ((null (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1503 ;; (nil PROPERTY VALUE BEG . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1504 (let ((tail (nthcdr 3 undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1505 (when (>= (car tail) position)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1506 (setcar tail (- (car tail) offset))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1507 (setcdr tail (- (cdr tail) offset))))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1508 (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
1509 (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
1510 (nreverse undo-list)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1511
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1512 (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
1513 "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
1514 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
1515 (cond ((integerp undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1516 (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
1517 (<= undo-elt end)))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1518 ((eq undo-elt nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1519 t)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1520 ((atom undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1521 nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1522 ((stringp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1523 ;; (TEXT . POSITION)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1524 (and (>= (abs (cdr undo-elt)) start)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1525 (< (abs (cdr undo-elt)) end)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1526 ((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
1527 ;; 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
1528 ;; See if MARKER is inside the region.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1529 (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
1530 (unless alist-elt
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1531 (setq alist-elt (cons (car undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1532 (marker-position (car undo-elt))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1533 (setq undo-adjusted-markers
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1534 (cons alist-elt undo-adjusted-markers)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1535 (and (cdr alist-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1536 (>= (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
1537 (<= (cdr alist-elt) end))))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1538 ((null (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1539 ;; (nil PROPERTY VALUE BEG . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1540 (let ((tail (nthcdr 3 undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1541 (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
1542 (<= (cdr tail) end))))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1543 ((integerp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1544 ;; (BEGIN . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1545 (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
1546 (<= (cdr undo-elt) end)))))
21175
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1547
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1548 (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
1549 "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
1550 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
1551 is not *inside* the region START...END."
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1552 (cond ((atom undo-elt) nil)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1553 ((null (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1554 ;; (nil PROPERTY VALUE BEG . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1555 (let ((tail (nthcdr 3 undo-elt)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1556 (not (or (< (car tail) end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1557 (> (cdr tail) start)))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1558 ((integerp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1559 ;; (BEGIN . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1560 (not (or (< (car undo-elt) end)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1561 (> (cdr undo-elt) start))))))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1562
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1563 ;; 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
1564 ;; 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
1565 ;; the undo.
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1566 (defun undo-delta (undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1567 (if (consp undo-elt)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1568 (cond ((stringp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1569 ;; (TEXT . POSITION)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1570 (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
1571 ((integerp (car undo-elt))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1572 ;; (BEGIN . END)
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1573 (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
1574 (t
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1575 '(0 . 0)))
e260c4389363 Implement selective undo (by Paul Flinders).
Richard M. Stallman <rms@gnu.org>
parents: 21122
diff changeset
1576 '(0 . 0)))
59055
f6e8a2dc456a (undo-outer-limit-truncate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 58961
diff changeset
1577
59790
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1578 (defcustom undo-ask-before-discard t
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1579 "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
1580 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
1581 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
1582 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
1583 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
1584 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
1585
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1586 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
1587 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
1588 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
1589 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
1590 excessively long before answering the question."
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1591 :type 'boolean
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1592 :group 'undo
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59790
diff changeset
1593 :version "22.1")
59790
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1594
59178
abe8f4f2982c (mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents: 59162
diff changeset
1595 (defvar undo-extra-outer-limit nil
abe8f4f2982c (mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents: 59162
diff changeset
1596 "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
1597 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
1598 current item gets bigger than this amount.
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1599
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1600 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
1601 (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
1602
59790
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1603 ;; 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
1604 ;; 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
1605 ;; 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
1606 ;; 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
1607 ;; lot of consing.
59055
f6e8a2dc456a (undo-outer-limit-truncate): New function.
Richard M. Stallman <rms@gnu.org>
parents: 58961
diff changeset
1608 (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
1609 (defun undo-outer-limit-truncate (size)
59790
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1610 (if undo-ask-before-discard
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1611 (when (or (null undo-extra-outer-limit)
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1612 (> size undo-extra-outer-limit))
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1613 ;; 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
1614 ;; 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
1615 ;; 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
1616 ;; again momentarily. It will call this function again,
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1617 ;; 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
1618 (setq undo-extra-outer-limit (+ size 50000))
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1619 (if (let (use-dialog-box track-mouse executing-kbd-macro )
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1620 (yes-or-no-p (format "Buffer %s undo info is %d bytes long; discard it? "
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1621 (buffer-name) size)))
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1622 (progn (setq buffer-undo-list nil)
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1623 (setq undo-extra-outer-limit nil)
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1624 t)
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1625 nil))
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1626 (display-warning '(undo discard-info)
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1627 (concat
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1628 (format "Buffer %s undo info was %d bytes long.\n"
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1629 (buffer-name) size)
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1630 "The undo info was discarded because it exceeded \
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1631 `undo-outer-limit'.
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1632
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1633 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
1634 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
1635 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
1636 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
1637 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
1638 maximum memory allotted to Emacs.
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1639
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1640 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
1641 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
1642
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1643 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
1644 \(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
1645 :warning)
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1646 (setq buffer-undo-list nil)
85fb49e8bc60 (undo-ask-before-discard): New var.
Luc Teirlinck <teirllm@auburn.edu>
parents: 59782
diff changeset
1647 t))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
1648
4374
1a64d641cea4 (shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4289
diff changeset
1649 (defvar shell-command-history nil
1a64d641cea4 (shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4289
diff changeset
1650 "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
1651
9779
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
1652 (defvar shell-command-switch "-c"
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
1653 "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
1654
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1655 (defvar shell-command-default-error-buffer nil
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1656 "*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
1657 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
1658 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
1659 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
1660
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1661 (defun shell-command (command &optional output-buffer error-buffer)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1662 "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
1663 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
1664
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1665 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
1666 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
1667 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
1668
33312
1e1d6d077288 (shell-command, display-message-or-buffer)
Gerd Moellmann <gerd@gnu.org>
parents: 32899
diff changeset
1669 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
1670 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
1671 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
1672 `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
1673 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
1674 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
1675
19109
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1676 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
1677 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
1678 before this command.
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1679
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1680 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
1681 `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
1682
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
1683 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
1684 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
1685 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
1686 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
1687 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
1688 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
1689
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1690 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
1691 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
1692 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
1693 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
1694 \(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
1695 `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
1696 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
1697
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1698 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
1699 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
1700 of the output.
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1701
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1702 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
1703 then `*Shell Command Output*' is deleted.
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1704
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1705 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
1706 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
1707 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
1708 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
1709 specifies the value of ERROR-BUFFER."
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1710
4488
b0a70d8d9af4 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 4477
diff changeset
1711 (interactive (list (read-from-minibuffer "Shell command: "
b0a70d8d9af4 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 4477
diff changeset
1712 nil nil nil 'shell-command-history)
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1713 current-prefix-arg
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1714 shell-command-default-error-buffer))
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1715 ;; 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
1716 (let ((handler
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1717 (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
1718 'shell-command)))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1719 (if handler
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1720 (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
1721 (if (and output-buffer
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1722 (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
1723 ;; Output goes in current buffer.
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1724 (let ((error-file
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1725 (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
1726 (make-temp-file
25483
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
1727 (expand-file-name "scor"
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
1728 (or small-temporary-file-directory
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
1729 temporary-file-directory)))
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1730 nil)))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1731 (barf-if-buffer-read-only)
24825
f88179cfae99 (shell-command): Avoid printing "mark set" message.
Karl Heuer <kwzh@gnu.org>
parents: 24814
diff changeset
1732 (push-mark nil t)
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1733 ;; 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
1734 ;; .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
1735 ;; "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
1736 ;; 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
1737 ;; 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
1738 (call-process shell-file-name nil
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1739 (if error-file
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1740 (list t error-file)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1741 t)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1742 nil shell-command-switch command)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1743 (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
1744 (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
1745 (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
1746 (let ((pos-from-end (- (point-max) (point))))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1747 (or (bobp)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1748 (insert "\f\n"))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1749 ;; Do no formatting while reading error file,
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1750 ;; 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
1751 ;; 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
1752 (format-insert-file error-file nil)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1753 ;; Put point after the inserted errors.
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1754 (goto-char (- (point-max) pos-from-end)))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1755 (display-buffer (current-buffer))))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1756 (delete-file error-file))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1757 ;; 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
1758 ;; 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
1759 ;; 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
1760 ;; because we inserted text.
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1761 (goto-char (prog1 (mark t)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1762 (set-marker (mark-marker) (point)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1763 (current-buffer)))))
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1764 ;; Output goes in a separate buffer.
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1765 ;; 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
1766 (save-match-data
46026
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1767 (if (string-match "[ \t]*&[ \t]*\\'" command)
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1768 ;; Command ending with ampersand means asynchronous.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1769 (let ((buffer (get-buffer-create
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1770 (or output-buffer "*Async Shell Command*")))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1771 (directory default-directory)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1772 proc)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1773 ;; Remove the ampersand.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1774 (setq command (substring command 0 (match-beginning 0)))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1775 ;; If will kill a process, query first.
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1776 (setq proc (get-buffer-process buffer))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1777 (if proc
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1778 (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
1779 (kill-process proc)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1780 (error "Shell command in progress")))
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
1781 (with-current-buffer buffer
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1782 (setq buffer-read-only nil)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1783 (erase-buffer)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1784 (display-buffer buffer)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1785 (setq default-directory directory)
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1786 (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
1787 shell-command-switch command))
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1788 (setq mode-line-process '(":%s"))
51026
8113316012c6 (shell-command): Undo last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50987
diff changeset
1789 (require 'shell) (shell-mode)
14627
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1790 (set-process-sentinel proc 'shell-command-sentinel)
670173a3653b (shell-command): Call file name handler.
Karl Heuer <kwzh@gnu.org>
parents: 14507
diff changeset
1791 ))
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1792 (shell-command-on-region (point) (point) command
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
1793 output-buffer nil error-buffer)))))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
1794
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1795 (defun display-message-or-buffer (message
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1796 &optional buffer-name not-this-window frame)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1797 "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
1798 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
1799
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1800 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
1801 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
1802 if `resize-mini-windows' is non-nil.
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1803
32260
b3df18daadfb Doc fix.
Miles Bader <miles@gnu.org>
parents: 32222
diff changeset
1804 Returns either the string shown in the echo area, or when a pop-up
b3df18daadfb Doc fix.
Miles Bader <miles@gnu.org>
parents: 32222
diff changeset
1805 buffer is used, the window used to display it.
b3df18daadfb Doc fix.
Miles Bader <miles@gnu.org>
parents: 32222
diff changeset
1806
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1807 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
1808 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
1809 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
1810 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
1811 the contents are inserted into the buffer anyway.
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1812
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1813 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
1814 and only used if a buffer is displayed."
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1815 (cond ((and (stringp message) (not (string-match "\n" message)))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1816 ;; 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
1817 (message "%s" message))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1818 ((and (stringp message)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1819 (= (string-match "\n" message) (1- (length message))))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1820 ;; 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
1821 (message "%s" (substring message 0 (1- (length message)))))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1822 (t
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1823 ;; General case
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1824 (with-current-buffer
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1825 (if (bufferp message)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1826 message
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1827 (get-buffer-create (or buffer-name "*Message*")))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1828
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1829 (unless (bufferp message)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1830 (erase-buffer)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1831 (insert message))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1832
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1833 (let ((lines
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1834 (if (= (buffer-size) 0)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1835 0
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1836 (count-lines (point-min) (point-max)))))
48013
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
1837 (cond ((= lines 0))
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
1838 ((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
1839 (<= lines
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1840 (if resize-mini-windows
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1841 (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
1842 (* (frame-height)
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1843 max-mini-window-height))
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1844 ((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
1845 max-mini-window-height)
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1846 (t
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1847 1))
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1848 1)))
312f417a8513 (shell-command): Match & only at end of whole command.
Richard M. Stallman <rms@gnu.org>
parents: 45870
diff changeset
1849 ;; 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
1850 ;; already dispayed in the selected frame.
46090
f52b57f5e2a4 (display-message-or-buffer): Fix last change.
Andreas Schwab <schwab@suse.de>
parents: 46088
diff changeset
1851 (not (get-buffer-window (current-buffer))))
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1852 ;; Echo area
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1853 (goto-char (point-max))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1854 (when (bolp)
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1855 (backward-char 1))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1856 (message "%s" (buffer-substring (point-min) (point))))
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1857 (t
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1858 ;; Buffer
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1859 (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
1860 (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
1861 not-this-window frame))))))))
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1862
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
1863
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1864 ;; We have a sentinel to prevent insertion of a termination message
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1865 ;; in the buffer itself.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1866 (defun shell-command-sentinel (process signal)
12565
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
1867 (if (memq (process-status process) '(exit signal))
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1868 (message "%s: %s."
12565
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
1869 (car (cdr (cdr (process-command process))))
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
1870 (substring signal 0 -1))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1871
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
1872 (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
1873 &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
1874 error-buffer display-error-buffer)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1875 "Execute string COMMAND in inferior shell with region as input.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1876 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
1877 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
1878 COMMAND.
10852
55552df3bd18 (shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10813
diff changeset
1879
19109
98515e50136d (shell-command-on-region, shell-command): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 19003
diff changeset
1880 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
1881 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
1882 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
1883 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
1884 `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
1885 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
1886
56761
486136b7f89c (shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents: 56613
diff changeset
1887 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
1888 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
1889 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
1890 `coding-system-for-read' and `coding-system-for-write'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1891
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1892 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
1893 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
1894 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
1895 \(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
1896 `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
1897 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
1898 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
1899
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1900 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
1901 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
1902
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
1903 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
1904 then `*Shell Command Output*' is deleted.
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
1905
10852
55552df3bd18 (shell-command-on-region): Rename arg; doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 10813
diff changeset
1906 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
1907 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
1908 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
1909 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
1910 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
1911 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
1912
23471
b6dbbd2cc3ac (shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23450
diff changeset
1913 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
1914 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
1915 around it.
b6dbbd2cc3ac (shell-command-on-region): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23450
diff changeset
1916
23588
cec6b3f8f355 (shell-command-on-region): Doc fix.
Andreas Schwab <schwab@suse.de>
parents: 23520
diff changeset
1917 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
1918 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
1919 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
1920 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
1921 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
1922 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
1923 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
1924 (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
1925 (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
1926 (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
1927 ;; 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
1928 ;; 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
1929 ;; 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
1930 (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
1931 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
1932 'shell-command-history))
13482
e49cd471ced7 (do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13328
diff changeset
1933 ;; call-interactively recognizes region-beginning and
e49cd471ced7 (do-auto-fill): Use fill-context-prefix.
Richard M. Stallman <rms@gnu.org>
parents: 13328
diff changeset
1934 ;; 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
1935 (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
1936 string
7b7874738e7c (shell-command-on-region): When computing interactive args,
Richard M. Stallman <rms@gnu.org>
parents: 10779
diff changeset
1937 current-prefix-arg
24106
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1938 current-prefix-arg
56761
486136b7f89c (shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents: 56613
diff changeset
1939 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
1940 t)))
19362
fddeff2c6697 (shell-command-on-region): New argument ERROR-BUFFER.
Richard M. Stallman <rms@gnu.org>
parents: 19343
diff changeset
1941 (let ((error-file
25483
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
1942 (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
1943 (make-temp-file
25483
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
1944 (expand-file-name "scor"
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
1945 (or small-temporary-file-directory
cd1649a27c08 (shell-command, shell-command-on-region): Use
Eli Zaretskii <eliz@gnu.org>
parents: 25400
diff changeset
1946 temporary-file-directory)))
24155
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1947 nil))
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1948 exit-status)
24106
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1949 (if (or replace
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1950 (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
1951 (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
1952 ;; 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
1953 (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
1954 ;; 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
1955 (goto-char start)
43794
8acd1399d389 (shell-command-on-region): Call push-mark with
Eli Zaretskii <eliz@gnu.org>
parents: 43581
diff changeset
1956 (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
1957 (setq exit-status
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1958 (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
1959 (if error-file
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1960 (list t error-file)
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1961 t)
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1962 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
1963 ;; 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
1964 ;; (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
1965 ;; (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
1966 ;; (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
1967 ;; 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
1968 (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
1969 ;; 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
1970 ;; replacing its entire contents.
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1971 (let ((buffer (get-buffer-create
46088
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
1972 (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
1973 (unwind-protect
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1974 (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
1975 ;; 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
1976 ;; 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
1977 ;; 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
1978 (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
1979 (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
1980 (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
1981 (setq exit-status
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1982 (call-process-region (point-min) (point-max)
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
1983 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
1984 (if error-file
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1985 (list t error-file)
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1986 t)
24155
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1987 nil shell-command-switch
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1988 command)))
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
1989 ;; 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
1990 ;; output there.
28703
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
1991 (let ((directory default-directory))
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
1992 (save-excursion
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
1993 (set-buffer buffer)
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
1994 (setq buffer-read-only nil)
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
1995 (if (not output-buffer)
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
1996 (setq default-directory directory))
8cc58b0b674d (shell-command): Set default directory for "*Shell
Gerd Moellmann <gerd@gnu.org>
parents: 28661
diff changeset
1997 (erase-buffer)))
24106
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1998 (setq exit-status
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
1999 (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
2000 (if error-file
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
2001 (list buffer error-file)
ea58bb66d0e3 (shell-command-on-region-default-error-buffer): New var.
Richard M. Stallman <rms@gnu.org>
parents: 24078
diff changeset
2002 buffer)
24155
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
2003 nil shell-command-switch command)))
41996
bdcb303c6aeb (undo): Always set this-command to `undo',
Richard M. Stallman <rms@gnu.org>
parents: 41924
diff changeset
2004 ;; Report the output.
43581
d7536b0977ac (shell-command-on-region): Report non-zero exit
Kim F. Storm <storm@cua.dk>
parents: 43436
diff changeset
2005 (with-current-buffer buffer
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
2006 (setq mode-line-process
46088
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2007 (cond ((null exit-status)
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2008 " - Error")
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2009 ((stringp exit-status)
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2010 (format " - Signal [%s]" exit-status))
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2011 ((not (equal 0 exit-status))
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2012 (format " - Exit [%d]" exit-status)))))
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2013 (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
2014 ;; 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
2015 (display-message-or-buffer buffer)
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2016 ;; 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
2017 (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
2018 (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
2019 (< 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
2020 "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
2021 "no output")))
46088
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2022 (cond ((null exit-status)
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2023 (message "(Shell command failed with error)"))
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2024 ((equal 0 exit-status)
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2025 (message "(Shell command succeeded with %s)"
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2026 output))
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2027 ((stringp exit-status)
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2028 (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
2029 exit-status))
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2030 (t
9d9568a15aa3 (shell-command-on-region): Handle errors and signals
Andreas Schwab <schwab@suse.de>
parents: 46026
diff changeset
2031 (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
2032 exit-status output))))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
2033 ;; 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
2034 ;; (kill-buffer buffer)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
2035 ))))
32203
f10445ddce32 (display-message-or-buffer): New function.
Miles Bader <miles@gnu.org>
parents: 32201
diff changeset
2036
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2037 (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
2038 (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
2039 (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
2040 (let ((pos-from-end (- (point-max) (point))))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2041 (or (bobp)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2042 (insert "\f\n"))
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2043 ;; Do no formatting while reading error file,
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2044 ;; 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
2045 ;; 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
2046 (format-insert-file error-file nil)
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2047 ;; Put point after the inserted errors.
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2048 (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
2049 (and display-error-buffer
486136b7f89c (shell-command-on-region): New arg DISPLAY-ERROR-BUFFER
Richard M. Stallman <rms@gnu.org>
parents: 56613
diff changeset
2050 (display-buffer (current-buffer)))))
24419
30e478cd167e (shell-command-default-error-buffer): Renamed from
Karl Heuer <kwzh@gnu.org>
parents: 24400
diff changeset
2051 (delete-file error-file))
24155
62548105541c (shell-command-on-region): Return command's exit
Dave Love <fx@gnu.org>
parents: 24106
diff changeset
2052 exit-status))
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2053
16312
20690a1ec100 (shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16018
diff changeset
2054 (defun shell-command-to-string (command)
20690a1ec100 (shell-command-to-string): New function.
Richard M. Stallman <rms@gnu.org>
parents: 16018
diff changeset
2055 "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
2056 (with-output-to-string
16316
50be5f6cb5e6 (shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents: 16312
diff changeset
2057 (with-current-buffer
50be5f6cb5e6 (shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents: 16312
diff changeset
2058 standard-output
50be5f6cb5e6 (shell-command-to-string): Make the buffer current
Richard M. Stallman <rms@gnu.org>
parents: 16312
diff changeset
2059 (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
2060
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57146
diff changeset
2061 (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
2062 "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
2063 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
2064 `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
2065 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
2066
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57146
diff changeset
2067 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
2068 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
2069 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
2070 `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
2071 and BUFFER.\)
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57146
diff changeset
2072
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57146
diff changeset
2073 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
2074 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
2075 value passed."
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57146
diff changeset
2076 (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
2077 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
2078 (unwind-protect
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57146
diff changeset
2079 (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
2080 (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
2081 (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
2082 (make-temp-file "emacs")))
4d4bfb9781e1 (process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57668
diff changeset
2083 (prog1
4d4bfb9781e1 (process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57668
diff changeset
2084 (apply 'call-process program
4d4bfb9781e1 (process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57668
diff changeset
2085 (or lc infile)
4d4bfb9781e1 (process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57668
diff changeset
2086 (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
2087 display args)
4d4bfb9781e1 (process-file): Fix logic.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57668
diff changeset
2088 (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
2089 (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
2090 (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
2091
b324ca4df07c * simple.el (process-file): New function, similar to call-process
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 57146
diff changeset
2092
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
2093
16685
26919ad3a4ad Change most defconsts to defvars.
Richard M. Stallman <rms@gnu.org>
parents: 16632
diff changeset
2094 (defvar universal-argument-map
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2095 (let ((map (make-sparse-keymap)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2096 (define-key map [t] 'universal-argument-other-key)
12313
eca218b0a8ca (negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents: 12266
diff changeset
2097 (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
2098 (define-key map [switch-frame] nil)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2099 (define-key map [?\C-u] 'universal-argument-more)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2100 (define-key map [?-] 'universal-argument-minus)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2101 (define-key map [?0] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2102 (define-key map [?1] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2103 (define-key map [?2] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2104 (define-key map [?3] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2105 (define-key map [?4] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2106 (define-key map [?5] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2107 (define-key map [?6] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2108 (define-key map [?7] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2109 (define-key map [?8] 'digit-argument)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2110 (define-key map [?9] 'digit-argument)
30347
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2111 (define-key map [kp-0] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2112 (define-key map [kp-1] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2113 (define-key map [kp-2] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2114 (define-key map [kp-3] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2115 (define-key map [kp-4] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2116 (define-key map [kp-5] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2117 (define-key map [kp-6] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2118 (define-key map [kp-7] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2119 (define-key map [kp-8] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2120 (define-key map [kp-9] 'digit-argument)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2121 (define-key map [kp-subtract] 'universal-argument-minus)
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2122 map)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2123 "Keymap used while processing \\[universal-argument].")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2124
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2125 (defvar universal-argument-num-events nil
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2126 "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
2127 `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
2128 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
2129
52966
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2130 (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
2131 "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
2132
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2133 (defvar saved-overriding-map nil
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2134 "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
2135 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
2136 argument mode\".")
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2137
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2138 (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
2139 "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
2140 (unless overriding-map-is-bound
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2141 (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
2142 (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
2143 (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
2144
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2145 (defun restore-overriding-map ()
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2146 "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
2147 (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
2148 (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
2149
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
2150 (defun universal-argument ()
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
2151 "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
2152 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
2153 \\[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
2154 \\[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
2155 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
2156 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
2157 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
2158 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
2159 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
2160 (interactive)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2161 (setq prefix-arg (list 4))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2162 (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
2163 (ensure-overriding-map-is-bound))
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
2164
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2165 ;; 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
2166 ;; 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
2167 (defun universal-argument-more (arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2168 (interactive "P")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2169 (if (consp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2170 (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
2171 (if (eq arg '-)
15e868121a15 (newline): Be more conservative about when to use the optimization.
Richard M. Stallman <rms@gnu.org>
parents: 17133
diff changeset
2172 (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
2173 (setq prefix-arg arg)
52966
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2174 (restore-overriding-map)))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2175 (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
2176
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2177 (defun negative-argument (arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2178 "Begin a negative numeric argument for the next command.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2179 \\[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
2180 (interactive "P")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2181 (cond ((integerp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2182 (setq prefix-arg (- arg)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2183 ((eq arg '-)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2184 (setq prefix-arg nil))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2185 (t
12313
eca218b0a8ca (negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents: 12266
diff changeset
2186 (setq prefix-arg '-)))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2187 (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
2188 (ensure-overriding-map-is-bound))
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
2189
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
2190 (defun digit-argument (arg)
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
2191 "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
2192 \\[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
2193 (interactive "P")
30347
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2194 (let* ((char (if (integerp last-command-char)
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2195 last-command-char
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2196 (get last-command-char 'ascii-character)))
a8a6780670ad (universal-argument-map): Bind numeric keypad keys
Gerd Moellmann <gerd@gnu.org>
parents: 30189
diff changeset
2197 (digit (- (logand char ?\177) ?0)))
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2198 (cond ((integerp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2199 (setq prefix-arg (+ (* arg 10)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2200 (if (< arg 0) (- digit) digit))))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2201 ((eq arg '-)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2202 ;; Treat -0 as just -, so that -01 will work.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2203 (setq prefix-arg (if (zerop digit) '- (- digit))))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2204 (t
12313
eca218b0a8ca (negative-argument, digit-argument):
Richard M. Stallman <rms@gnu.org>
parents: 12266
diff changeset
2205 (setq prefix-arg digit))))
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2206 (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
2207 (ensure-overriding-map-is-bound))
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
2208
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2209 ;; 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
2210 ;; command if digits have already been entered.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2211 (defun universal-argument-minus (arg)
12230
7275b8e0d272 (universal-argument, describe-arg): Restore Lisp code,
Karl Heuer <kwzh@gnu.org>
parents: 11975
diff changeset
2212 (interactive "P")
12266
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2213 (if (integerp arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2214 (universal-argument-other-key arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2215 (negative-argument arg)))
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2216
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2217 ;; 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
2218 ;; executed as a command.
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2219 (defun universal-argument-other-key (arg)
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2220 (interactive "P")
bdc0826013e0 (universal-argument-map): New var.
Karl Heuer <kwzh@gnu.org>
parents: 12230
diff changeset
2221 (setq prefix-arg arg)
12334
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2222 (let* ((key (this-command-keys))
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2223 (keylist (listify-key-sequence key)))
326cccb5f51a (universal-argument-num-events): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 12320
diff changeset
2224 (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
2225 (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
2226 unread-command-events)))
12320
979836b1a1a9 (universal-argument-other-key): Call reset-this-command-lengths.
Richard M. Stallman <rms@gnu.org>
parents: 12313
diff changeset
2227 (reset-this-command-lengths)
52966
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
2228 (restore-overriding-map))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
2229
61111
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2230 (defvar buffer-substring-filters nil
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2231 "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
2232 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
2233 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
2234 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
2235 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
2236 return value of `filter-buffer-substring'.
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2237
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2238 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
2239
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2240 (defun filter-buffer-substring (beg end &optional delete)
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2241 "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
2242 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
2243 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
2244 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
2245 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
2246
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2247 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
2248 from the buffer.
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2249
62919
038ca3b7ba0d (filter-buffer-substring): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 62739
diff changeset
2250 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
2251 `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
2252 where the text came from.
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2253
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2254 This function should be used instead of `buffer-substring' or
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2255 `delete-and-extract-region' when you want to allow filtering to
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2256 take place. For example, major or minor modes can use
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2257 `buffer-substring-filters' to extract characters that are special
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2258 to a buffer, and should not be copied into other buffers."
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2259 (save-excursion
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2260 (goto-char beg)
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2261 (let ((string (if delete (delete-and-extract-region beg end)
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2262 (buffer-substring beg end))))
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2263 (dolist (filter buffer-substring-filters string)
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2264 (setq string (funcall filter string))))))
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2265
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2266 ;;;; Window system cut and paste hooks.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2267
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2268 (defvar interprogram-cut-function nil
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2269 "Function to call to make a killed region available to other programs.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2270
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2271 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
2272 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
2273 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
2274 is put in the kill ring, to make the new kill available to other
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2275 programs.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2276
3034
dd65780e6246 (kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents: 3029
diff changeset
2277 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
2278 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
2279 the text which should be made available.
54058
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
2280 The second, optional, argument PUSH, has the same meaning as the
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
2281 similar argument to `x-set-cut-buffer', which see.")
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2282
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2283 (defvar interprogram-paste-function nil
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2284 "Function to call to get text cut from other programs.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2285
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2286 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
2287 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
2288 This variable holds a function that Emacs calls to obtain
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2289 text that other programs have provided for pasting.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2290
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2291 The function should be called with no arguments. If the function
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2292 returns nil, then no other program has provided such text, and the top
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2293 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
2294 string, then the caller of the function \(usually `current-kill')
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
2295 should put this string in the kill ring as the latest kill.
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
2296
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
2297 Note that the function should return a string only if a program other
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
2298 than Emacs has provided a string for pasting; if Emacs provided the
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
2299 most recent string, the function should return nil. If it is
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
2300 difficult to tell whether Emacs or some other program provided the
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
2301 current string, it is probably good enough to return nil if the string
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
2302 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
2303
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2304
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
2305
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2306 ;;;; The kill ring data structure.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2307
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2308 (defvar kill-ring nil
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2309 "List of killed text sequences.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2310 Since the kill ring is supposed to interact nicely with cut-and-paste
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2311 facilities offered by window systems, use of this variable should
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2312 interact nicely with `interprogram-cut-function' and
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2313 `interprogram-paste-function'. The functions `kill-new',
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2314 `kill-append', and `current-kill' are supposed to implement this
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2315 interaction; you may want to use them instead of manipulating the kill
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2316 ring directly.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2317
23495
d5f08ad9a40b (kill-ring-max): Increased to 60.
Richard M. Stallman <rms@gnu.org>
parents: 23491
diff changeset
2318 (defcustom kill-ring-max 60
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2319 "*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
2320 :type 'integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2321 :group 'killing)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2322
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2323 (defvar kill-ring-yank-pointer nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2324 "The tail of the kill ring whose car is the last thing yanked.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2325
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
2326 (defun kill-new (string &optional replace yank-handler)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2327 "Make STRING the latest kill in the kill ring.
44273
5180d0ff95f6 (kill-new): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 44252
diff changeset
2328 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
2329 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
2330 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
2331 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
2332
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
2333 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
2334 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
2335 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
2336 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
2337
c52c622747ca (kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49364
diff changeset
2338 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
2339 argument is not used by `insert-for-yank'. However, since Lisp code
c52c622747ca (kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49364
diff changeset
2340 may access and use elements from the kill-ring directly, the STRING
c52c622747ca (kill-new): Improve doc string for yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49364
diff changeset
2341 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
2342 (if (> (length string) 0)
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
2343 (if yank-handler
53931
bfe6c29e5283 (kill-new): Put yank-handler property on the entire string.
Luc Teirlinck <teirllm@auburn.edu>
parents: 53925
diff changeset
2344 (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
2345 '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
2346 (if yank-handler
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
2347 (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
2348 (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
2349 (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
2350 (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
2351 (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
2352 (setcar kill-ring string)
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
2353 (setq kill-ring (cons string kill-ring))
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
2354 (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
2355 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil)))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2356 (setq kill-ring-yank-pointer kill-ring)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2357 (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
2358 (funcall interprogram-cut-function string (not replace))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2359
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
2360 (defun kill-append (string before-p &optional yank-handler)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2361 "Append STRING to the end of the latest kill in the kill ring.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2362 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
2363 Optional third argument YANK-HANDLER, if non-nil, specifies the
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
2364 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
2365 string. If the specified yank-handler arg differs from the
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
2366 yank-handler property of the latest kill string, this function
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
2367 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
2368 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
2369 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
2370 (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
2371 (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
2372 (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
2373 (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
2374 yank-handler)))
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2375
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2376 (defun current-kill (n &optional do-not-move)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2377 "Rotate the yanking point by N places, and then return that kill.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2378 If N is zero, `interprogram-paste-function' is set, and calling it
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2379 returns a string, then that string is added to the front of the
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2380 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
2381 If optional arg DO-NOT-MOVE is non-nil, then don't actually move the
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2382 yanking point; just return the Nth kill forward."
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2383 (let ((interprogram-paste (and (= n 0)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2384 interprogram-paste-function
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2385 (funcall interprogram-paste-function))))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2386 (if interprogram-paste
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2387 (progn
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2388 ;; Disable the interprogram cut function when we add the new
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2389 ;; text to the kill ring, so Emacs doesn't try to own the
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2390 ;; selection, with identical text.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2391 (let ((interprogram-cut-function nil))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2392 (kill-new interprogram-paste))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2393 interprogram-paste)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2394 (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
2395 (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
2396 (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
2397 (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
2398 kill-ring)))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2399 (or do-not-move
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2400 (setq kill-ring-yank-pointer ARGth-kill-element))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2401 (car ARGth-kill-element)))))
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2402
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2403
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
2404
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2405 ;;;; Commands for manipulating the kill ring.
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2406
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2407 (defcustom kill-read-only-ok nil
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2408 "*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
2409 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
2410 :group 'killing)
7063
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
2411
14507
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
2412 (put 'text-read-only 'error-conditions
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
2413 '(text-read-only buffer-read-only error))
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
2414 (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
2415
49309
c033d9bff1cc (kill-new, kill-append, kill-region): New optional parameter yank-handler.
Kim F. Storm <storm@cua.dk>
parents: 49227
diff changeset
2416 (defun kill-region (beg end &optional yank-handler)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2417 "Kill between point and mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2418 The text is deleted but saved in the kill ring.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2419 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
2420 \(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
2421
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
2422 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
2423 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
2424
1834
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
2425 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
2426 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
2427 you can use the killing commands to copy text from a read-only buffer.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2428
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2429 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
2430 Supply two arguments, character positions indicating the stretch of text
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2431 to be killed.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2432 Any command that calls this function is a \"kill command\".
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2433 If the previous command was also a kill command,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2434 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
2435 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
2436
54058
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
2437 In Lisp code, optional third arg YANK-HANDLER, if non-nil,
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
2438 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
2439 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
2440 (interactive "r")
20279
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
2441 (condition-case nil
61111
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2442 (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
2443 (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
2444 ;; 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
2445 (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
2446 (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
2447 (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
2448 (when (or string (eq last-command 'kill-region))
54058
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
2449 (setq this-command 'kill-region))
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
2450 nil)
20279
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
2451 ((buffer-read-only text-read-only)
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
2452 ;; 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
2453 ;; in the region, are read-only.
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
2454 ;; 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
2455 ;; However, there's no harm in putting
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
2456 ;; 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
2457 (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
2458 ;; 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
2459 (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
2460 ;; 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
2461 (if kill-read-only-ok
54058
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
2462 (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
2463 ;; 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
2464 (barf-if-buffer-read-only)
69a6030e443a (kill-region): Detect read-only text
Karl Heuer <kwzh@gnu.org>
parents: 20265
diff changeset
2465 ;; 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
2466 (signal 'text-read-only (list (current-buffer)))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2467
9876
75ecf866cfb8 Comment reason for preceding change.
Karl Heuer <kwzh@gnu.org>
parents: 9870
diff changeset
2468 ;; 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
2469 ;; 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
2470 ;; then corrects it with the intended C-w.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2471 (defun copy-region-as-kill (beg end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2472 "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
2473 In Transient Mark mode, deactivate the mark.
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
2474 If `interprogram-cut-function' is non-nil, also save the text for a window
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
2475 system cut and paste."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2476 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2477 (if (eq last-command 'kill-region)
61111
43d165e3db5b (idle-update-delay): Move definition up.
Richard M. Stallman <rms@gnu.org>
parents: 61070
diff changeset
2478 (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
2479 (kill-new (filter-buffer-substring beg end)))
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2480 (if transient-mark-mode
21193
20bba919ec72 (copy-region-as-kill): Set deactivate-mark
Richard M. Stallman <rms@gnu.org>
parents: 21175
diff changeset
2481 (setq deactivate-mark t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2482 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2483
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2484 (defun kill-ring-save (beg end)
2111
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
2485 "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
2486 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
2487 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
2488 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
2489
36110
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
2490 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
2491 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
2492
3467
002945794814 (kill-ring-save): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 3408
diff changeset
2493 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
2494 visual feedback indicating the extent of the region being copied."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2495 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2496 (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
2497 ;; 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
2498 ;; 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
2499 (if (interactive-p)
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2500 (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
2501 (opoint (point))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2502 ;; 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
2503 ;; 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
2504 (inhibit-quit t))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2505 (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
2506 (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
2507 (face-background 'region))
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2508 ;; Swap point and mark.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2509 (set-marker (mark-marker) (point) (current-buffer))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2510 (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
2511 (sit-for blink-matching-delay)
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2512 ;; Swap back.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2513 (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
2514 (goto-char opoint)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2515 ;; If user quit, deactivate the mark
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2516 ;; 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
2517 (and quit-flag mark-active
4287
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
2518 (deactivate-mark)))
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2519 (let* ((killed-text (current-kill 0))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2520 (message-len (min (length killed-text) 40)))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2521 (if (= (point) beg)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2522 ;; Don't say "killed"; that is misleading.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2523 (message "Saved text until \"%s\""
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2524 (substring killed-text (- message-len)))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2525 (message "Saved text from \"%s\""
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
2526 (substring killed-text 0 message-len))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2527
24798
6fe40d35360e (append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents: 24789
diff changeset
2528 (defun append-next-kill (&optional interactive)
6fe40d35360e (append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents: 24789
diff changeset
2529 "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
2530 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
2531 (interactive "p")
6fe40d35360e (append-next-kill): Use an arg to distinguish
Karl Heuer <kwzh@gnu.org>
parents: 24789
diff changeset
2532 ;; 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
2533 (if interactive
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2534 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2535 (setq this-command 'kill-region)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2536 (message "If the next command is a kill, it will append"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2537 (setq last-command 'kill-region)))
44667
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2538
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2539 ;; Yanking.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2540
44667
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2541 ;; 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
2542 (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
2543 '(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
2544 yank-handler follow-link)
51461
5bcd833ec510 (yank-excluded-properties): Expand documentation string.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51324
diff changeset
2545 "*Text properties to discard when yanking.
5bcd833ec510 (yank-excluded-properties): Expand documentation string.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51324
diff changeset
2546 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
2547 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
2548 :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
2549 :group 'killing
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59790
diff changeset
2550 :version "22.1")
44667
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2551
48583
150e7a54d970 (yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 48406
diff changeset
2552 (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
2553 (defvar yank-undo-function nil
49364
25243a7167f4 Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49336
diff changeset
2554 "If non-nil, function used by `yank-pop' to delete last stretch of yanked text.
25243a7167f4 Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49336
diff changeset
2555 Function is called with two parameters, START and END corresponding to
25243a7167f4 Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49336
diff changeset
2556 the value of the mark and point; it is guaranteed that START <= END.
25243a7167f4 Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49336
diff changeset
2557 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
2558
54058
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
2559 (defun yank-pop (&optional arg)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2560 "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
2561 This command is allowed only immediately after a `yank' or a `yank-pop'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2562 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
2563 previously-killed text. `yank-pop' deletes that text and inserts in its
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2564 place a different stretch of killed text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2565
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2566 With no argument, the previous kill is inserted.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2567 With argument N, insert the Nth previous kill.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2568 If N is negative, this is a more recent kill.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2569
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2570 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
2571 comes the newest one.
71a259bf6342 (yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents: 62179
diff changeset
2572
71a259bf6342 (yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents: 62179
diff changeset
2573 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
2574 `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
2575 doc string for `insert-for-yank-1', which see."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2576 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2577 (if (not (eq last-command 'yank))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2578 (error "Previous command was not a yank"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2579 (setq this-command 'yank)
54058
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
2580 (unless arg (setq arg 1))
14507
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
2581 (let ((inhibit-read-only t)
ec4424facc98 (text-read-only): New error symbol.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
2582 (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
2583 (if before
ebc6f47b202e (yank-pop): Always call yank-undo-function with start <= end.
Kim F. Storm <storm@cua.dk>
parents: 49309
diff changeset
2584 (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
2585 (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
2586 (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
2587 (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
2588 (insert-for-yank (current-kill arg))
48583
150e7a54d970 (yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 48406
diff changeset
2589 ;; 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
2590 ;; if possible.
150e7a54d970 (yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 48406
diff changeset
2591 (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
2592 (if before
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2593 ;; 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
2594 ;; 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
2595 ;; 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
2596 (goto-char (prog1 (mark t)
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2597 (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
2598 nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2599
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2600 (defun yank (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2601 "Reinsert the last stretch of killed text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2602 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
2603 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
2604 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
2605 With argument N, reinsert the Nth most recently killed stretch of killed
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2606 text.
62632
71a259bf6342 (yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents: 62179
diff changeset
2607
71a259bf6342 (yank, yank-pop): Mention `yank-excluded-properties'
Eli Zaretskii <eliz@gnu.org>
parents: 62179
diff changeset
2608 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
2609 `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
2610 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
2611
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2612 See also the command \\[yank-pop]."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2613 (interactive "*P")
48583
150e7a54d970 (yank-window-start): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 48406
diff changeset
2614 (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
2615 ;; 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
2616 ;; for the following command.
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
2617 (setq this-command t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2618 (push-mark (point))
44667
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2619 (insert-for-yank (current-kill (cond
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2620 ((listp arg) 0)
54058
4a5aa6868a14 (interprogram-cut-function)
Luc Teirlinck <teirllm@auburn.edu>
parents: 53931
diff changeset
2621 ((eq arg '-) -2)
44667
6374552100a2 (yank-excluded-properties): New user option.
Richard M. Stallman <rms@gnu.org>
parents: 44664
diff changeset
2622 (t (1- arg)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2623 (if (consp arg)
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2624 ;; 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
2625 ;; 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
2626 ;; 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
2627 (goto-char (prog1 (mark t)
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2628 (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
2629 ;; 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
2630 (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
2631 (setq this-command 'yank))
2111
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
2632 nil)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2633
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2634 (defun rotate-yank-pointer (arg)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2635 "Rotate the yanking point in the kill ring.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2636 With argument, rotate that many kills forward (or backward, if negative)."
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2637 (interactive "p")
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2638 (current-kill arg))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
2639
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2640 ;; Some kill commands.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2641
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2642 ;; Internal subroutine of delete-char
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2643 (defun kill-forward-chars (arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2644 (if (listp arg) (setq arg (car arg)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2645 (if (eq arg '-) (setq arg -1))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2646 (kill-region (point) (forward-point arg)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2647
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2648 ;; Internal subroutine of backward-delete-char
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2649 (defun kill-backward-chars (arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2650 (if (listp arg) (setq arg (car arg)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2651 (if (eq arg '-) (setq arg -1))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2652 (kill-region (point) (forward-point (- arg))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2653
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2654 (defcustom backward-delete-char-untabify-method 'untabify
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2655 "*The method for untabifying when deleting backward.
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2656 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
2657 `hungry' -- delete all whitespace, both tabs and spaces;
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2658 `all' -- delete all whitespace, including tabs, spaces and newlines;
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2659 nil -- just delete one character."
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2660 :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
2661 :version "20.3"
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2662 :group 'killing)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2663
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2664 (defun backward-delete-char-untabify (arg &optional killp)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2665 "Delete characters backward, changing tabs into spaces.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2666 The exact behavior depends on `backward-delete-char-untabify-method'.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2667 Delete ARG chars, and kill (save in kill ring) if KILLP is non-nil.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2668 Interactively, ARG is the prefix arg (default 1)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2669 and KILLP is t if a prefix arg was specified."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2670 (interactive "*p\nP")
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2671 (when (eq backward-delete-char-untabify-method 'untabify)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2672 (let ((count arg))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2673 (save-excursion
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2674 (while (and (> count 0) (not (bobp)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2675 (if (= (preceding-char) ?\t)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2676 (let ((col (current-column)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2677 (forward-char -1)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2678 (setq col (- col (current-column)))
49784
48e671543e1e (backward-delete-char-untabify): Fix use of character constant.
Juanma Barranquero <lekktu@gmail.com>
parents: 49597
diff changeset
2679 (insert-char ?\ col)
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2680 (delete-char 1)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2681 (forward-char -1)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2682 (setq count (1- count))))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2683 (delete-backward-char
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2684 (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
2685 ((eq backward-delete-char-untabify-method 'all)
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2686 " \t\n\r"))))
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2687 (if skip
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2688 (let ((wh (- (point) (save-excursion (skip-chars-backward skip)
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2689 (point)))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2690 (+ arg (if (zerop wh) 0 (1- wh))))
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
2691 arg))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2692 killp))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2693
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2694 (defun zap-to-char (arg char)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2695 "Kill up to and including ARG'th occurrence of CHAR.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2696 Case is ignored if `case-fold-search' is non-nil in the current buffer.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2697 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
2698 (interactive "p\ncZap to char: ")
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2699 (kill-region (point) (progn
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2700 (search-forward (char-to-string char) nil nil arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2701 ; (goto-char (if (> arg 0) (1- (point)) (1+ (point))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2702 (point))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
2703
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2704 ;; kill-line and its subroutines.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2705
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2706 (defcustom kill-whole-line nil
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2707 "*If non-nil, `kill-line' with no arg at beg of line kills the whole line."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2708 :type 'boolean
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2709 :group 'killing)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2710
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2711 (defun kill-line (&optional arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2712 "Kill the rest of the current line; if no nonblanks there, kill thru newline.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2713 With prefix argument, kill that many lines from point.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2714 Negative arguments kill lines backward.
32267
b84a9fb24453 (kill-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 32260
diff changeset
2715 With zero argument, kills the text before point on the current line.
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2716
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2717 When calling from a program, nil means \"no arg\",
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2718 a number counts as a prefix arg.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2719
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2720 To kill a whole line, when point is not at the beginning, type \
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2721 \\[beginning-of-line] \\[kill-line] \\[kill-line].
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2722
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2723 If `kill-whole-line' is non-nil, then this command kills the whole line
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2724 including its terminating newline, when used at the beginning of a line
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2725 with no argument. As a consequence, you can always kill a whole line
35916
5a41fb5ed099 (kill-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35886
diff changeset
2726 by typing \\[beginning-of-line] \\[kill-line].
5a41fb5ed099 (kill-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35886
diff changeset
2727
36110
116beb1b2fc7 (kill-region, kill-line, kill-ring-save): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 36030
diff changeset
2728 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
2729 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
2730
35916
5a41fb5ed099 (kill-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35886
diff changeset
2731 If the buffer is read-only, Emacs will beep and refrain from deleting
5a41fb5ed099 (kill-line): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 35886
diff changeset
2732 the line, but put the line in the kill ring anyway. This means that
50652
b108545d1f24 (kill-line): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 50383
diff changeset
2733 you can use this command to copy text from a read-only buffer.
b108545d1f24 (kill-line): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 50383
diff changeset
2734 \(If the variable `kill-read-only-ok' is non-nil, then this won't
b108545d1f24 (kill-line): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 50383
diff changeset
2735 even beep.)"
27836
132294fa754e (zap-to-char, kill-line, kill-region, kill-word)
Dave Love <fx@gnu.org>
parents: 27477
diff changeset
2736 (interactive "P")
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2737 (kill-region (point)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2738 ;; It is better to move point to the other end of the kill
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2739 ;; before killing. That way, in a read-only buffer, point
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2740 ;; moves across the text that is copied to the kill ring.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2741 ;; The choice has no effect on undo now that undo records
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2742 ;; the value of point from before the command was run.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2743 (progn
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2744 (if arg
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2745 (forward-visible-line (prefix-numeric-value arg))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2746 (if (eobp)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2747 (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
2748 (let ((end
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2749 (save-excursion
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2750 (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
2751 (if (or (save-excursion
54259
86345e064999 (undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents: 54058
diff changeset
2752 ;; If trailing whitespace is visible,
86345e064999 (undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents: 54058
diff changeset
2753 ;; 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
2754 (unless show-trailing-whitespace
86345e064999 (undo): Temporarily set this-command to `undo-start',
Richard M. Stallman <rms@gnu.org>
parents: 54058
diff changeset
2755 (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
2756 (= (point) end))
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2757 (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
2758 (forward-visible-line 1)
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2759 (goto-char end))))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2760 (point))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2761
51101
821f85e23a1f * simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51026
diff changeset
2762 (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
2763 "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
2764 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
2765 If arg is negative, kill backward. Also kill the preceding newline.
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2766 \(This is meant to make C-x z work well with negative arguments.\)
51101
821f85e23a1f * simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51026
diff changeset
2767 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
2768 (interactive "p")
51324
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2769 (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
2770 (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
2771 (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
2772 (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
2773 (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
2774 (kill-new "")
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2775 (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
2776 (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
2777 ;; 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
2778 ;; 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
2779 ;; 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
2780 ;; 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
2781 ;; 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
2782 ;; 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
2783 (save-excursion
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2784 (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
2785 (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
2786 ((< arg 0)
51324
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2787 (save-excursion
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2788 (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
2789 (kill-region (point)
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2790 (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
2791 (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
2792 (point))))
51101
821f85e23a1f * simple.el (kill-whole-line): New function.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 51026
diff changeset
2793 (t
51324
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2794 (save-excursion
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2795 (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
2796 (kill-region (point)
dfd8b52708ae (kill-whole-line): Make it interact correctly with the kill ring.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51304
diff changeset
2797 (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
2798
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2799 (defun forward-visible-line (arg)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2800 "Move forward by ARG lines, ignoring currently invisible newlines only.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2801 If ARG is negative, move backward -ARG lines.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2802 If ARG is zero, move to the beginning of the current line."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2803 (condition-case nil
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2804 (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
2805 (progn
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2806 (while (> arg 0)
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2807 (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
2808 (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
2809 ;; 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
2810 ;; 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
2811 (let ((prop
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2812 (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
2813 (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
2814 prop
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2815 (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
2816 (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
2817 (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
2818 (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
2819 ;; 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
2820 ;; skip it.
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2821 (let ((opoint (point)))
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2822 (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
2823 (let ((prop
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2824 (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
2825 (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
2826 prop
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2827 (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
2828 (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
2829 (goto-char
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2830 (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
2831 (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
2832 (point-max))
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2833 (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
2834 (unless (bolp)
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2835 (goto-char opoint))))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2836 (let ((first t))
51219
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
2837 (while (or first (<= arg 0))
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
2838 (if first
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2839 (beginning-of-line)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2840 (or (zerop (forward-line -1))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2841 (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
2842 ;; 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
2843 ;; 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
2844 (unless (bobp)
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2845 (let ((prop
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2846 (get-char-property (1- (point)) 'invisible)))
51219
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
2847 (unless (if (eq buffer-invisibility-spec t)
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
2848 prop
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
2849 (or (memq prop buffer-invisibility-spec)
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
2850 (assq prop buffer-invisibility-spec)))
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
2851 (setq arg (1+ arg)))))
b86109f9a829 (forward-visible-line): Fix negative arguments.
Juanma Barranquero <lekktu@gmail.com>
parents: 51118
diff changeset
2852 (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
2853 ;; 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
2854 ;; skip it.
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2855 (let ((opoint (point)))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2856 (while (and (not (bobp))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2857 (let ((prop
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2858 (get-char-property (1- (point)) 'invisible)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2859 (if (eq buffer-invisibility-spec t)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2860 prop
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2861 (or (memq prop buffer-invisibility-spec)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2862 (assq prop buffer-invisibility-spec)))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2863 (goto-char
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2864 (if (get-text-property (1- (point)) 'invisible)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2865 (or (previous-single-property-change (point) 'invisible)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2866 (point-min))
47316
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2867 (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
2868 (unless (bolp)
c4537edce898 (undo-elt-in-region): Fix one-off error at END.
Richard M. Stallman <rms@gnu.org>
parents: 47266
diff changeset
2869 (goto-char opoint)))))
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2870 ((beginning-of-buffer end-of-buffer)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2871 nil)))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2872
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2873 (defun end-of-visible-line ()
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2874 "Move to end of current visible line."
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2875 (end-of-line)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2876 ;; If the following character is currently invisible,
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2877 ;; skip all characters with that same `invisible' property value,
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2878 ;; then find the next newline.
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2879 (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
2880 (save-excursion
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2881 (skip-chars-forward "^\n")
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2882 (let ((prop
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2883 (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
2884 (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
2885 prop
1f4d03aef3cf (kill-line): Use end-of-visible-line to determine
Richard M. Stallman <rms@gnu.org>
parents: 46872
diff changeset
2886 (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
2887 (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
2888 (skip-chars-forward "^\n")
25292
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2889 (if (get-text-property (point) 'invisible)
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2890 (goto-char (next-single-property-change (point) 'invisible))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2891 (goto-char (next-overlay-change (point))))
0a9e93f020a3 Functions reordered.
Karl Heuer <kwzh@gnu.org>
parents: 25237
diff changeset
2892 (end-of-line)))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
2893
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2894 (defun insert-buffer (buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2895 "Insert after point the contents of BUFFER.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2896 Puts mark after the inserted text.
26723
b4f7c98850f0 (insert-buffer): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 26521
diff changeset
2897 BUFFER may be a buffer or a buffer name.
b4f7c98850f0 (insert-buffer): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 26521
diff changeset
2898
b4f7c98850f0 (insert-buffer): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 26521
diff changeset
2899 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
2900 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
2901 (interactive
14834
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
2902 (list
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
2903 (progn
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
2904 (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
2905 (read-buffer "Insert buffer: "
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
2906 (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
2907 (other-buffer (current-buffer))
5ae5d97727ce * simple.el (insert-buffer): Interactive default changed to a more
Francesco Potortì <pot@gnu.org>
parents: 14721
diff changeset
2908 (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
2909 t))))
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
2910 (push-mark
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
2911 (save-excursion
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
2912 (insert-buffer-substring (get-buffer buffer))
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
2913 (point)))
1982
d65c1fefc636 * simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents: 1838
diff changeset
2914 nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2915
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2916 (defun append-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2917 "Append to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2918 It is inserted into that buffer before its point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2919
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2920 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2921 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2922 START and END specify the portion of the current buffer to be copied."
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
2923 (interactive
10048
db01a04d2afb (append-to-buffer): Don't use current buffer as default.
Richard M. Stallman <rms@gnu.org>
parents: 10034
diff changeset
2924 (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
2925 (region-beginning) (region-end)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2926 (let ((oldbuf (current-buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2927 (save-excursion
28187
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2928 (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
2929 (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
2930 point)
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2931 (set-buffer append-to)
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2932 (setq point (point))
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2933 (barf-if-buffer-read-only)
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2934 (insert-buffer-substring oldbuf start end)
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2935 (dolist (window windows)
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2936 (when (= (window-point window) point)
507041681c73 (append-to-buffer): Update point of windows after
Gerd Moellmann <gerd@gnu.org>
parents: 28113
diff changeset
2937 (set-window-point window (point))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2938
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2939 (defun prepend-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2940 "Prepend to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2941 It is inserted into that buffer after its point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2942
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2943 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2944 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2945 START and END specify the portion of the current buffer to be copied."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2946 (interactive "BPrepend to buffer: \nr")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2947 (let ((oldbuf (current-buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2948 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2949 (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
2950 (barf-if-buffer-read-only)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2951 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2952 (insert-buffer-substring oldbuf start end)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2953
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2954 (defun copy-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2955 "Copy to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2956 It is inserted into that buffer, replacing existing text there.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2957
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2958 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2959 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2960 START and END specify the portion of the current buffer to be copied."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2961 (interactive "BCopy to buffer: \nr")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2962 (let ((oldbuf (current-buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2963 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2964 (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
2965 (barf-if-buffer-read-only)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2966 (erase-buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2967 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2968 (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
2969
4040
d06d7295d3eb Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents: 3967
diff changeset
2970 (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
2971 (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
2972
60463
be3ac492036f (activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents: 60414
diff changeset
2973 (defvar activate-mark-hook nil
be3ac492036f (activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents: 60414
diff changeset
2974 "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
2975 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
2976 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
2977
be3ac492036f (activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents: 60414
diff changeset
2978 (defvar deactivate-mark-hook nil
be3ac492036f (activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents: 60414
diff changeset
2979 "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
2980
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
2981 (defun mark (&optional force)
3487
8c151ebeff9c (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 3467
diff changeset
2982 "Return this buffer's mark value as integer; error if mark inactive.
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
2983 If optional argument FORCE is non-nil, access the mark value
3487
8c151ebeff9c (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 3467
diff changeset
2984 even if the mark is not currently active, and return nil
8c151ebeff9c (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 3467
diff changeset
2985 if there is no mark at all.
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
2986
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2987 If you are using this in an editing command, you are most likely making
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2988 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
2989 (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
2990 (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
2991 (signal 'mark-inactive nil)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2992
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
2993 ;; 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
2994 ;; run deactivate-mark-hook. This shorthand should simplify.
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
2995 (defsubst deactivate-mark ()
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
2996 "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
2997 \(That makes a difference only in Transient Mark mode.)
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
2998 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
2999 (cond
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3000 ((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
3001 (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
3002 (transient-mark-mode
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3003 (setq mark-active nil)
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3004 (run-hooks 'deactivate-mark-hook))))
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
3005
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3006 (defun set-mark (pos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3007 "Set this buffer's mark to POS. Don't use this function!
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3008 That is to say, don't use this function unless you want
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3009 the user to see that the mark has moved, and you want the previous
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3010 mark position to be lost.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3011
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3012 Normally, when a new mark is set, the old one should go on the stack.
61121
ca079ae96939 (set-mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 61111
diff changeset
3013 This is why most applications should use `push-mark', not `set-mark'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3014
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3015 Novice Emacs Lisp programmers often try to use the mark for the wrong
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3016 purposes. The mark saves a location for the user's convenience.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3017 Most editing commands should not alter the mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3018 To remember a location for internal use in the Lisp program,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3019 store it in a Lisp variable. Example:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3020
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3021 (let ((beg (point))) (forward-line 1) (delete-region beg (point)))."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3022
4287
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
3023 (if pos
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
3024 (progn
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
3025 (setq mark-active t)
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
3026 (run-hooks 'activate-mark-hook)
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
3027 (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
3028 ;; 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
3029 ;; 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
3030 ;; 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
3031 (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
3032 (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
3033 (set-marker (mark-marker) nil)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3034
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3035 (defvar mark-ring nil
8695
0f702e9ab06d (mark-ring): Add permanent-local prop. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8660
diff changeset
3036 "The list of former marks of the current buffer, most recent first.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3037 (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
3038 (put 'mark-ring 'permanent-local t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3039
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3040 (defcustom mark-ring-max 16
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3041 "*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
3042 :type 'integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3043 :group 'editing-basics)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3044
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
3045 (defvar global-mark-ring nil
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
3046 "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
3047
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3048 (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
3049 "*Maximum size of global mark ring. \
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3050 Start discarding off end if gets this big."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3051 :type 'integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3052 :group 'editing-basics)
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
3053
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3054 (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
3055 "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
3056 \(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
3057 (interactive)
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3058 (if (null (mark t))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3059 (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
3060 (goto-char (mark t))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3061 (pop-mark)))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3062
45540
1756da24c6ba (push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents: 45386
diff changeset
3063 (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
3064 "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
3065 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
3066 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
3067 (interactive "P")
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3068 (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
3069 (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
3070 (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
3071 (setq mark-active t)
60463
be3ac492036f (activate-mark-hook, deactivate-mark-hook): Add defvars.
Richard M. Stallman <rms@gnu.org>
parents: 60414
diff changeset
3072 (run-hooks 'activate-mark-hook)
45540
1756da24c6ba (push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents: 45386
diff changeset
3073 (unless nomsg
1756da24c6ba (push-mark-command): Added optional NOMSG arg.
Kim F. Storm <storm@cua.dk>
parents: 45386
diff changeset
3074 (message "Mark activated")))))
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3075
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3076 (defun set-mark-command (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3077 "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
3078 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
3079 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
3080 another buffer. Immediately repeating the command activates
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
3081 `transient-mark-mode' temporarily.
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
3082
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
3083 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
3084 jump to mark, and pop a new position
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
3085 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
3086 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
3087 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
3088
50383
2018e9013e52 (pop-global-mark-quick-repeat): Remove defcustom.
Kim F. Storm <storm@cua.dk>
parents: 50292
diff changeset
3089 Repeating the \\[set-mark-command] command without the prefix jumps to
2018e9013e52 (pop-global-mark-quick-repeat): Remove defcustom.
Kim F. Storm <storm@cua.dk>
parents: 50292
diff changeset
3090 the next position off the local (or global) mark ring.
50251
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
3091
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
3092 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
3093 \\[universal-argument] \\[set-mark-command], unconditionally
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
3094 set mark where point is.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3095
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3096 Novice Emacs Lisp programmers often try to use the mark for the wrong
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3097 purposes. See the documentation of `set-mark' for more information."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3098 (interactive "P")
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3099 (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
3100 (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
3101 (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
3102 ((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
3103 (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
3104 ((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
3105 (if arg
92b336df72b8 (pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents: 44586
diff changeset
3106 (pop-to-mark-command)
92b336df72b8 (pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents: 44586
diff changeset
3107 (push-mark-command t)))
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3108 ((eq last-command 'pop-to-mark-command)
50251
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
3109 (setq this-command 'pop-to-mark-command)
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
3110 (pop-to-mark-command))
50383
2018e9013e52 (pop-global-mark-quick-repeat): Remove defcustom.
Kim F. Storm <storm@cua.dk>
parents: 50292
diff changeset
3111 ((and (eq last-command 'pop-global-mark) (not arg))
50251
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
3112 (setq this-command 'pop-global-mark)
4893760b5129 (set-mark-command): Doc fixes.
Kim F. Storm <storm@cua.dk>
parents: 49784
diff changeset
3113 (pop-global-mark))
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3114 (arg
44664
92b336df72b8 (pop-to-mark-command): Do not set this-command.
Kim F. Storm <storm@cua.dk>
parents: 44586
diff changeset
3115 (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
3116 (pop-to-mark-command))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3117 ((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
3118 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
3119 (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
3120 (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
3121 (t
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3122 (push-mark-command nil))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3123
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
3124 (defun push-mark (&optional location nomsg activate)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3125 "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
3126 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
3127 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
3128 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
3129 In Transient Mark mode, activate mark if optional third arg ACTIVATE non-nil.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3130
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
3131 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
3132 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
3133
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
3134 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
3135 (unless (null (mark t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3136 (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
3137 (when (> (length mark-ring) mark-ring-max)
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
3138 (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
3139 (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
3140 (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
3141 ;; 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
3142 (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
3143 (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
3144 ;; 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
3145 ;; 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
3146 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
3147 (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
3148 (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
3149 (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
3150 (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
3151 (or nomsg executing-kbd-macro (> (minibuffer-depth) 0)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3152 (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
3153 (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
3154 (set-mark (mark t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3155 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3156
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3157 (defun pop-mark ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3158 "Pop off mark ring into the buffer's actual mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3159 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
3160 (when mark-ring
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
3161 (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
3162 (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
3163 (move-marker (car mark-ring) nil)
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
3164 (if (null (mark t)) (ding))
59486
3b3f211ffa93 (pop-mark): Move deactivate-mark out of conditional
Juri Linkov <juri@jurta.org>
parents: 59397
diff changeset
3165 (setq mark-ring (cdr mark-ring)))
3b3f211ffa93 (pop-mark): Move deactivate-mark out of conditional
Juri Linkov <juri@jurta.org>
parents: 59397
diff changeset
3166 (deactivate-mark))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3167
16436
d2acc84badf4 Use defalias not define-function.
Richard M. Stallman <rms@gnu.org>
parents: 16417
diff changeset
3168 (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
3169 (defun exchange-point-and-mark (&optional arg)
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
3170 "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
3171 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
3172 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
3173 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
3174 (interactive "P")
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3175 (if arg
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
3176 (if mark-active
44586
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3177 (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
3178 (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
3179 (setq arg nil)))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3180 (unless arg
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3181 (let ((omark (mark t)))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3182 (if (null omark)
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3183 (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
3184 (set-mark (point))
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3185 (goto-char omark)
2776503d098e (pop-to-mark-command, push-mark-command): New commands.
Kim F. Storm <storm@cua.dk>
parents: 44505
diff changeset
3186 nil)))
2796
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
3187
47408
2239db3433ca (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47364
diff changeset
3188 (define-minor-mode transient-mark-mode
2796
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
3189 "Toggle Transient Mark mode.
2935
653e14f61220 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 2850
diff changeset
3190 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
3191
5372
ac927443eae9 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5343
diff changeset
3192 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
3193 Changing the buffer \"deactivates\" the mark.
ac927443eae9 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5343
diff changeset
3194 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
3195 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
3196 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
3197
37092
c365952bf534 (transient-mark-mode): Mention ESC ESC ESC in the doc string as well.
Eli Zaretskii <eliz@gnu.org>
parents: 37074
diff changeset
3198 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
3199 \\[keyboard-escape-quit].
37074
43067b78ec71 (transient-mark-mode): Mention C-g in the doc string.
Eli Zaretskii <eliz@gnu.org>
parents: 36668
diff changeset
3200
35631
bc0a3dbd22f6 (transient-mark-mode): Document the fact that many
Eli Zaretskii <eliz@gnu.org>
parents: 35589
diff changeset
3201 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
3202 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
3203 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
3204 \\[comment-dwim], \\[flush-lines], \\[keep-lines], \
44dfc09c6b67 * simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents: 58754
diff changeset
3205 \\[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
3206 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
3207 \"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
3208 commands which are sensitive to the Transient Mark mode."
47464
b8282a873821 (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47462
diff changeset
3209 :global t :group 'editing-basics :require nil)
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
3210
61986
91b85d61710d (widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 61950
diff changeset
3211 (defvar widen-automatically t
91b85d61710d (widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 61950
diff changeset
3212 "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
3213 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
3214 the current accessible part of the buffer.
91b85d61710d (widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 61950
diff changeset
3215
91b85d61710d (widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 61950
diff changeset
3216 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
3217 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
3218
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
3219 (defun pop-global-mark ()
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
3220 "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
3221 (interactive)
7881
4ab8723cd491 (pop-global-mark): Discard entries for nonexistent buffers.
Richard M. Stallman <rms@gnu.org>
parents: 7877
diff changeset
3222 ;; 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
3223 (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
3224 (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
3225 (or global-mark-ring
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
3226 (error "No global mark set"))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
3227 (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
3228 (buffer (marker-buffer marker))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
3229 (position (marker-position marker)))
10351
e34cbd5276bd (pop-global-mark): Make pop-global-mark treat
Richard M. Stallman <rms@gnu.org>
parents: 10284
diff changeset
3230 (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
3231 (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
3232 (set-buffer buffer)
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
3233 (or (and (>= position (point-min))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
3234 (<= position (point-max)))
61986
91b85d61710d (widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 61950
diff changeset
3235 (if widen-automatically
91b85d61710d (widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 61950
diff changeset
3236 (error "Global mark position is outside accessible part of buffer")
91b85d61710d (widen-automatically): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 61950
diff changeset
3237 (widen)))
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
3238 (goto-char position)
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
3239 (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
3240
34101
559c35839090 (next-line-add-newlines): Change default to nil.
Gerd Moellmann <gerd@gnu.org>
parents: 34071
diff changeset
3241 (defcustom next-line-add-newlines nil
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3242 "*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
3243 :type 'boolean
35333
ac14700e2c6b (next-line-add-newlines): Add :version.
Dave Love <fx@gnu.org>
parents: 35327
diff changeset
3244 :version "21.1"
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3245 :group 'editing-basics)
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
3246
60590
1b9a61c42a06 (next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents: 60486
diff changeset
3247 (defun next-line (&optional arg try-vscroll)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3248 "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
3249 Interactively, vscroll tall lines if `auto-window-vscroll' is enabled.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3250 If there is no character in the target line exactly under the current column,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3251 the cursor is positioned after the character in that line which spans this
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3252 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
3253 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
3254 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
3255 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
3256 cursor to the end of the buffer.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3257
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3258 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
3259 a semipermanent goal column for this command.
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
3260 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
3261 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
3262 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
3263 when there is no goal column.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3264
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3265 If you are thinking of using this in a Lisp program, consider
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3266 using `forward-line' instead. It is usually easier to use
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3267 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
3268 (interactive "p\np")
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
3269 (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
3270 (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
3271 (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
3272 ;; 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
3273 (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
3274 (end-of-line)
65f3042831db (next-line): Goto end-of-line before inserting a newline.
Gerd Moellmann <gerd@gnu.org>
parents: 35776
diff changeset
3275 (insert "\n"))
60590
1b9a61c42a06 (next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents: 60486
diff changeset
3276 (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
3277 (if (interactive-p)
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
3278 (condition-case nil
60590
1b9a61c42a06 (next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents: 60486
diff changeset
3279 (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
3280 ((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
3281 (line-move arg nil nil try-vscroll)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3282 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3283
60590
1b9a61c42a06 (next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents: 60486
diff changeset
3284 (defun previous-line (&optional arg try-vscroll)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3285 "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
3286 Interactively, vscroll tall lines if `auto-window-vscroll' is enabled.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3287 If there is no character in the target line exactly over the current column,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3288 the cursor is positioned after the character in that line which spans this
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3289 column, or at the end of the line if it is not long enough.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3290
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3291 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
3292 a semipermanent goal column for this command.
3c958a136c4a (next-line, previous-line): Doc fixes.
Richard M. Stallman <rms@gnu.org>
parents: 18498
diff changeset
3293 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
3294 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
3295 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
3296 when there is no goal column.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3297
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3298 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
3299 `forward-line' with a negative argument instead. It is usually easier
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3300 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
3301 (interactive "p\np")
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
3302 (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
3303 (if (interactive-p)
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
3304 (condition-case nil
60590
1b9a61c42a06 (next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents: 60486
diff changeset
3305 (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
3306 ((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
3307 (line-move (- arg) nil nil try-vscroll))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3308 nil)
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
3309
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3310 (defcustom track-eol nil
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3311 "*Non-nil means vertical motion starting at end of line keeps to ends of lines.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3312 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
3313 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
3314 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3315 :group 'editing-basics)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3316
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3317 (defcustom goal-column nil
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3318 "*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
3319 :type '(choice integer
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3320 (const :tag "None" nil))
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3321 :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
3322 (make-variable-buffer-local 'goal-column)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3323
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3324 (defvar temporary-goal-column 0
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3325 "Current goal column for vertical motion.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3326 It is the column where point was
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3327 at the start of current run of vertical motion commands.
513
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
3328 When the `track-eol' feature is doing its job, the value is 9999.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3329
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3330 (defcustom line-move-ignore-invisible t
10949
99c9f475a355 (line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10943
diff changeset
3331 "*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
3332 Outline mode sets this."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3333 :type 'boolean
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3334 :group 'editing-basics)
10949
99c9f475a355 (line-move-ignore-invisible): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10943
diff changeset
3335
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3336 (defun line-move-invisible-p (pos)
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3337 "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
3338 (let ((prop
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3339 (get-char-property pos 'invisible)))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3340 (if (eq buffer-invisibility-spec t)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3341 prop
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3342 (or (memq prop buffer-invisibility-spec)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3343 (assq prop buffer-invisibility-spec)))))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3344
63136
bbac4c8066b4 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 63063
diff changeset
3345 ;; This is like line-move-1 except that it also performs
bbac4c8066b4 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 63063
diff changeset
3346 ;; vertical scrolling of tall images if appropriate.
bbac4c8066b4 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 63063
diff changeset
3347 ;; That is not really a clean thing to do, since it mixes
bbac4c8066b4 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 63063
diff changeset
3348 ;; scrolling with cursor motion. But so far we don't have
bbac4c8066b4 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 63063
diff changeset
3349 ;; a cleaner solution to the problem of making C-n do something
bbac4c8066b4 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 63063
diff changeset
3350 ;; 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
3351 (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
3352 (if (and auto-window-vscroll try-vscroll
63136
bbac4c8066b4 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 63063
diff changeset
3353 ;; 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
3354 (not defining-kbd-macro)
1b9a61c42a06 (next-line, previous-line): Add optional try-vscroll
Kim F. Storm <storm@cua.dk>
parents: 60486
diff changeset
3355 (not executing-kbd-macro))
59680
1d33b3da1157 (line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents: 59626
diff changeset
3356 (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
3357 (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
3358 (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
3359 (> (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
3360 (set-window-vscroll nil
1d33b3da1157 (line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents: 59626
diff changeset
3361 (if forward
1d33b3da1157 (line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents: 59626
diff changeset
3362 (+ (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
3363 (min (cdr part)
59680
1d33b3da1157 (line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents: 59626
diff changeset
3364 (* (frame-char-height) arg)))
1d33b3da1157 (line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents: 59626
diff changeset
3365 (max 0
1d33b3da1157 (line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents: 59626
diff changeset
3366 (- (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
3367 (min (car part)
59680
1d33b3da1157 (line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents: 59626
diff changeset
3368 (* (frame-char-height) (- arg))))))
1d33b3da1157 (line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents: 59626
diff changeset
3369 t)
1d33b3da1157 (line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents: 59626
diff changeset
3370 (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
3371 (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
3372 (when (not forward)
63037
e7db86688ce6 Add comment to line-move re. sit-for.
Kim F. Storm <storm@cua.dk>
parents: 63022
diff changeset
3373 ;; 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
3374 ;; 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
3375 (sit-for 0)
63136
bbac4c8066b4 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 63063
diff changeset
3376 ;; If the current line is partly hidden at the bottom,
bbac4c8066b4 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 63063
diff changeset
3377 ;; 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
3378 (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
3379 (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
3380 (> (cdr part) 0))
5378f1ac43f4 (line-move): Only call sit-for when moving backwards.
Kim F. Storm <storm@cua.dk>
parents: 62919
diff changeset
3381 (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
3382 t)))
59680
1d33b3da1157 (line-move-1): Rename from line-move.
Kim F. Storm <storm@cua.dk>
parents: 59626
diff changeset
3383 (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
3384
11326
0d5ebc078c51 (line-move): Turn off intangibility for intermediate stops.
Richard M. Stallman <rms@gnu.org>
parents: 11324
diff changeset
3385 ;; 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
3386 ;; 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
3387 ;; 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
3388 (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
3389 ;; 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
3390 ;; for intermediate positions.
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
3391 (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
3392 (opoint (point))
58754
b41534d7c63c (blink-matching-open): Obey syntax-table text properties.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58625
diff changeset
3393 (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
3394 (unwind-protect
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
3395 (progn
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3396 (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
3397 (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
3398 (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
3399 ;; 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
3400 ;; 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
3401 (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
3402 9999
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
3403 (current-column))))
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3404
11479
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
3405 (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
3406 (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
3407 ;; 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
3408 ;; 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
3409 (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
3410 (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
3411 ;; 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
3412 ;; 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
3413 ;; 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
3414 (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
3415 (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
3416 (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
3417 (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
3418 (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
3419 (setq arg 0)))
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3420 (unless noerror
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3421 (signal (if (< arg 0)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3422 'beginning-of-buffer
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3423 'end-of-buffer)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3424 nil)))
11479
266653a85b65 (line-move): Fix previous change: if we get an error,
Richard M. Stallman <rms@gnu.org>
parents: 11362
diff changeset
3425 ;; 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
3426 (let (done)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3427 (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
3428 ;; 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
3429 ;; 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
3430 (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
3431 (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
3432 ;; Now move a line.
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3433 (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
3434 ;; If there's no invisibility here, move over the newline.
62093
ea21bf283231 (line-move-1): Fix 2005-04-26 change. Must still use
Kim F. Storm <storm@cua.dk>
parents: 62059
diff changeset
3435 (if (and (not (integerp selective-display))
ea21bf283231 (line-move-1): Fix 2005-04-26 change. Must still use
Kim F. Storm <storm@cua.dk>
parents: 62059
diff changeset
3436 (not (line-move-invisible-p (point))))
61864
af1b504ffc35 (line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents: 61671
diff changeset
3437 ;; We avoid vertical-motion when possible
af1b504ffc35 (line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents: 61671
diff changeset
3438 ;; because that has to fontify.
af1b504ffc35 (line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents: 61671
diff changeset
3439 (if (eobp)
62093
ea21bf283231 (line-move-1): Fix 2005-04-26 change. Must still use
Kim F. Storm <storm@cua.dk>
parents: 62059
diff changeset
3440 (if (not noerror)
ea21bf283231 (line-move-1): Fix 2005-04-26 change. Must still use
Kim F. Storm <storm@cua.dk>
parents: 62059
diff changeset
3441 (signal 'end-of-buffer nil)
ea21bf283231 (line-move-1): Fix 2005-04-26 change. Must still use
Kim F. Storm <storm@cua.dk>
parents: 62059
diff changeset
3442 (setq done t))
61864
af1b504ffc35 (line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents: 61671
diff changeset
3443 (forward-line 1))
af1b504ffc35 (line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents: 61671
diff changeset
3444 ;; Otherwise move a more sophisticated way.
af1b504ffc35 (line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents: 61671
diff changeset
3445 ;; (What's the logic behind this code?)
af1b504ffc35 (line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents: 61671
diff changeset
3446 (and (zerop (vertical-motion 1))
af1b504ffc35 (line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents: 61671
diff changeset
3447 (if (not noerror)
af1b504ffc35 (line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents: 61671
diff changeset
3448 (signal 'end-of-buffer nil)
af1b504ffc35 (line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents: 61671
diff changeset
3449 (setq done t))))
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3450 (unless done
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3451 (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
3452 ;; 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
3453 ;; 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
3454 (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
3455 (beginning-of-line)
62093
ea21bf283231 (line-move-1): Fix 2005-04-26 change. Must still use
Kim F. Storm <storm@cua.dk>
parents: 62059
diff changeset
3456 (if (or (bobp)
ea21bf283231 (line-move-1): Fix 2005-04-26 change. Must still use
Kim F. Storm <storm@cua.dk>
parents: 62059
diff changeset
3457 (and (not (integerp selective-display))
ea21bf283231 (line-move-1): Fix 2005-04-26 change. Must still use
Kim F. Storm <storm@cua.dk>
parents: 62059
diff changeset
3458 (not (line-move-invisible-p (1- (point))))))
61864
af1b504ffc35 (line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents: 61671
diff changeset
3459 (if (bobp)
62059
1f57a1631e42 (line-move-1): Fix previous change to signal errors appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 61986
diff changeset
3460 (if (not noerror)
1f57a1631e42 (line-move-1): Fix previous change to signal errors appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 61986
diff changeset
3461 (signal 'beginning-of-buffer nil)
1f57a1631e42 (line-move-1): Fix previous change to signal errors appropriately.
Richard M. Stallman <rms@gnu.org>
parents: 61986
diff changeset
3462 (setq done t))
61864
af1b504ffc35 (line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents: 61671
diff changeset
3463 (forward-line -1))
af1b504ffc35 (line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents: 61671
diff changeset
3464 (if (zerop (vertical-motion -1))
af1b504ffc35 (line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents: 61671
diff changeset
3465 (if (not noerror)
af1b504ffc35 (line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents: 61671
diff changeset
3466 (signal 'beginning-of-buffer nil)
af1b504ffc35 (line-move-1): Avoid using vertical-motion in easy cases.
Richard M. Stallman <rms@gnu.org>
parents: 61671
diff changeset
3467 (setq done t))))
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3468 (unless done
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3469 (setq arg (1+ arg))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3470 (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
3471 ;; 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
3472 (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
3473 (< arg 0))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3474 (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
3475 (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
3476 ;; 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
3477 (= arg 0))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3478
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
3479 (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
3480 ;; 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
3481 ;; 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
3482 (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
3483 ((< 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
3484 ;; 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
3485 ;; 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
3486 (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
3487 (t
58354
36916d006f6b (line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents: 58046
diff changeset
3488 (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
3489 opoint forward))))))
36916d006f6b (line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents: 58046
diff changeset
3490
36916d006f6b (line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents: 58046
diff changeset
3491 (defun line-move-finish (column opoint forward)
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3492 (let ((repeat t))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3493 (while repeat
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3494 ;; 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
3495 (setq repeat nil)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3496
44756
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
3497 (let (new
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3498 (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
3499 (line-end
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
3500 ;; Compute the end of the line
58354
36916d006f6b (line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents: 58046
diff changeset
3501 ;; ignoring effectively invisible newlines.
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3502 (save-excursion
58354
36916d006f6b (line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents: 58046
diff changeset
3503 (end-of-line)
36916d006f6b (line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents: 58046
diff changeset
3504 (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
3505 (goto-char (next-char-property-change (point)))
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3506 (end-of-line))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3507 (point))))
44756
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
3508
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
3509 ;; 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
3510 (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
3511 (setq new (point))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3512
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3513 ;; Process intangibility within a line.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3514 ;; Move to the chosen destination position from above,
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3515 ;; with intangibility processing enabled.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3516
19003
9d24caacda44 (line-move): If intangibility moves us to a different line,
Richard M. Stallman <rms@gnu.org>
parents: 18902
diff changeset
3517 (goto-char (point-min))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3518 (let ((inhibit-point-motion-hooks nil))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3519 (goto-char new)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3520
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3521 ;; If intangibility moves us to a different (later) place
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3522 ;; in the same line, use that as the destination.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3523 (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
3524 (setq new (point))
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
3525 ;; If that position is "too late",
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
3526 ;; try the previous allowable position.
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
3527 ;; See if it is ok.
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
3528 (backward-char)
58354
36916d006f6b (line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents: 58046
diff changeset
3529 (if (if forward
36916d006f6b (line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents: 58046
diff changeset
3530 ;; If going forward, don't accept the previous
36916d006f6b (line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents: 58046
diff changeset
3531 ;; allowable position if it is before the target line.
58951
c7ebd794182b (next-error-buffer-p, next-error-find-buffer): Doc fix.
Juri Linkov <juri@jurta.org>
parents: 58917
diff changeset
3532 (< line-beg (point))
58354
36916d006f6b (line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents: 58046
diff changeset
3533 ;; If going backward, don't accept the previous
36916d006f6b (line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents: 58046
diff changeset
3534 ;; allowable position if it is still after the target line.
36916d006f6b (line-move-finish): New arg FORWARD.
Richard M. Stallman <rms@gnu.org>
parents: 58046
diff changeset
3535 (<= (point) line-end))
44756
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
3536 (setq new (point))
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
3537 ;; As a last resort, use the end of the line.
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
3538 (setq new line-end))))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3539
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3540 ;; Now move to the updated destination, processing fields
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3541 ;; as well as intangibility.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3542 (goto-char opoint)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3543 (let ((inhibit-point-motion-hooks nil))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3544 (goto-char
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3545 (constrain-to-field new opoint nil t
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3546 'inhibit-line-move-field-capture)))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3547
44756
56b4ca0725c1 (line-move-finish): Find beg and end of line
Richard M. Stallman <rms@gnu.org>
parents: 44667
diff changeset
3548 ;; 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
3549 ;; retry everything within that new line.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3550 (when (or (< (point) line-beg) (> (point) line-end))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3551 ;; Repeat the intangibility and field processing.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3552 (setq repeat t))))))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3553
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3554 (defun line-move-to-column (col)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3555 "Try to find column COL, considering invisibility.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3556 This function works only in certain cases,
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3557 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
3558 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
3559 (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
3560 (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
3561 (move-to-column col))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3562
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3563 (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
3564 (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
3565 (let ((normal-location (point))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3566 (normal-column (current-column)))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3567 ;; If the following character is currently invisible,
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3568 ;; 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
3569 (while (and (not (eobp))
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3570 (line-move-invisible-p (point)))
42366
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3571 (goto-char (next-char-property-change (point))))
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3572 ;; Have we advanced to a larger column position?
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3573 (if (> (current-column) normal-column)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3574 ;; 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
3575 ;; See if we can make any further progress.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3576 (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
3577 ;; Otherwise, go to the place we originally found
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3578 ;; and move back over invisible text.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3579 ;; 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
3580 ;; but with a more reasonable buffer position.
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3581 (goto-char normal-location)
8c5f3e3e60da (line-move-invisible): New subroutine.
Richard M. Stallman <rms@gnu.org>
parents: 42170
diff changeset
3582 (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
3583 (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
3584 (goto-char (previous-char-property-change (point) line-beg))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3585
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3586 (defun move-end-of-line (arg)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3587 "Move point to end of current line.
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3588 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
3589 If point reaches the beginning or end of buffer, it stops there.
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3590 To ignore intangibility, bind `inhibit-point-motion-hooks' to t.
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3591
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3592 This command does not move point across a field boundary unless doing so
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3593 would move beyond there to a different line; if ARG is nil or 1, and
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3594 point starts at a field boundary, point does not move. To ignore field
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3595 boundaries bind `inhibit-field-text-motion' to t."
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3596 (interactive "p")
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3597 (or arg (setq arg 1))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3598 (let (done)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3599 (while (not done)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3600 (let ((newpos
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3601 (save-excursion
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3602 (let ((goal-column 0))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3603 (and (line-move arg t)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3604 (not (bobp))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3605 (progn
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3606 (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
3607 (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
3608 (backward-char 1)))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3609 (point)))))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3610 (goto-char newpos)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3611 (if (and (> (point) newpos)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3612 (eq (preceding-char) ?\n))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3613 (backward-char 1)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3614 (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
3615 (not (eq (following-char) ?\n)))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3616 ;; If we skipped something intangible
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3617 ;; 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
3618 ;; keep going.
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3619 (setq arg 1)
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3620 (setq done t)))))))
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3621
60486
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
3622 (defun move-beginning-of-line (arg)
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
3623 "Move point to beginning of current display line.
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
3624 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
3625 If point reaches the beginning or end of buffer, it stops there.
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
3626 To ignore intangibility, bind `inhibit-point-motion-hooks' to t.
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
3627
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
3628 This command does not move point across a field boundary unless doing so
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
3629 would move beyond there to a different line; if ARG is nil or 1, and
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
3630 point starts at a field boundary, point does not move. To ignore field
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
3631 boundaries bind `inhibit-field-text-motion' to t."
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
3632 (interactive "p")
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
3633 (or arg (setq arg 1))
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
3634 (if (/= arg 1)
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
3635 (line-move (1- arg) t))
60664
2edb492f66d9 (move-beginning-of-line): Move to beginning of buffer
Kim F. Storm <storm@cua.dk>
parents: 60645
diff changeset
3636 (beginning-of-line 1)
60619
e51f0754a4c4 (move-beginning-of-line): Use vertical-motion.
Kim F. Storm <storm@cua.dk>
parents: 60609
diff changeset
3637 (let ((orig (point)))
e51f0754a4c4 (move-beginning-of-line): Use vertical-motion.
Kim F. Storm <storm@cua.dk>
parents: 60609
diff changeset
3638 (vertical-motion 0)
60664
2edb492f66d9 (move-beginning-of-line): Move to beginning of buffer
Kim F. Storm <storm@cua.dk>
parents: 60645
diff changeset
3639 (if (/= orig (point))
2edb492f66d9 (move-beginning-of-line): Move to beginning of buffer
Kim F. Storm <storm@cua.dk>
parents: 60645
diff changeset
3640 (goto-char (constrain-to-field (point) orig (/= arg 1) t nil)))))
60486
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
3641
47a57ff1da21 (move-beginning-of-line): New command.
Kim F. Storm <storm@cua.dk>
parents: 60463
diff changeset
3642
1771
3f0f18d4eb8c * simple.el (set-goal-column): Make this command disabled by default.
Jim Blandy <jimb@redhat.com>
parents: 1760
diff changeset
3643 ;;; 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
3644 ;;; 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
3645 (put 'set-goal-column 'disabled t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3646
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3647 (defun set-goal-column (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3648 "Set the current horizontal position as a goal for \\[next-line] and \\[previous-line].
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3649 Those commands will move to this position in the line moved to
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3650 rather than trying to keep the same horizontal position.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3651 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
3652 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
3653 The goal column is stored in the variable `goal-column'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3654 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3655 (if arg
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3656 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3657 (setq goal-column nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3658 (message "No goal column"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3659 (setq goal-column (current-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3660 (message (substitute-command-keys
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3661 "Goal column %d (use \\[set-goal-column] with an arg to unset it)")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3662 goal-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3663 nil)
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3664
8006
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
3665
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
3666 (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
3667 "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
3668 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
3669 (interactive "P")
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
3670 (scroll-other-window
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
3671 ;; Just invert the argument's meaning.
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
3672 ;; 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
3673 (if (eq lines '-) nil
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
3674 (if (null lines) '-
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
3675 (- (prefix-numeric-value lines))))))
8057
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3676
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3677 (defun beginning-of-buffer-other-window (arg)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3678 "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
3679 Leave mark at previous position.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3680 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
3681 (interactive "P")
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3682 (let ((orig-window (selected-window))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3683 (window (other-window-for-scrolling)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3684 ;; 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
3685 ;; 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
3686 (unwind-protect
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3687 (progn
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3688 (select-window window)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3689 ;; 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
3690 (with-no-warnings
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3691 (beginning-of-buffer arg))
8057
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3692 ;; Set point accordingly.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3693 (recenter '(t)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3694 (select-window orig-window))))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3695
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3696 (defun end-of-buffer-other-window (arg)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3697 "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
3698 Leave mark at previous position.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3699 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
3700 (interactive "P")
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3701 ;; See beginning-of-buffer-other-window for comments.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3702 (let ((orig-window (selected-window))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3703 (window (other-window-for-scrolling)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3704 (unwind-protect
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3705 (progn
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3706 (select-window window)
58046
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3707 (with-no-warnings
e24a83048e7b (next-error group, face): Move before first use.
Richard M. Stallman <rms@gnu.org>
parents: 57853
diff changeset
3708 (end-of-buffer arg))
8057
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3709 (recenter '(t)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
3710 (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
3711
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3712 (defun transpose-chars (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3713 "Interchange characters around point, moving forward one character.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3714 With prefix arg ARG, effect is to take character before point
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3715 and drag it forward past ARG other characters (backward if ARG negative).
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3716 If no argument and at end of line, the previous two chars are exchanged."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3717 (interactive "*P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3718 (and (null arg) (eolp) (forward-char -1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3719 (transpose-subr 'forward-char (prefix-numeric-value arg)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3720
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3721 (defun transpose-words (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3722 "Interchange words around point, leaving point at end of them.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3723 With prefix arg ARG, effect is to take word before or around point
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3724 and drag it forward past ARG other words (backward if ARG negative).
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3725 If ARG is zero, the words around or after point and around or after mark
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3726 are interchanged."
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3727 ;; FIXME: `foo a!nd bar' should transpose into `bar and foo'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3728 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3729 (transpose-subr 'forward-word arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3730
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3731 (defun transpose-sexps (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3732 "Like \\[transpose-words] but applies to sexps.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3733 Does not work on a sexp that point is in the middle of
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3734 if it is a list or string."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3735 (interactive "*p")
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3736 (transpose-subr
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3737 (lambda (arg)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3738 ;; 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
3739 ;; (cons (progn (forward-sexp x) (point))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3740 ;; (progn (forward-sexp (- x)) (point)))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3741 ;; 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
3742 ;; 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
3743 ;; 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
3744 (if (if (> arg 0)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3745 (looking-at "\\sw\\|\\s_")
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3746 (and (not (bobp))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3747 (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
3748 ;; 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
3749 (progn (funcall (if (> arg 0)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3750 'skip-syntax-backward 'skip-syntax-forward)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3751 "w_")
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3752 (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
3753 ;; 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
3754 ;; 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
3755 ;; we're going.
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3756 (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
3757 (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
3758 (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
3759 (not (zerop (funcall (if (> arg 0)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3760 'skip-syntax-forward
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3761 'skip-syntax-backward)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3762 ".")))))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3763 (point)))))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3764 arg 'special))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3765
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3766 (defun transpose-lines (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3767 "Exchange current line and previous line, leaving point after both.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3768 With argument ARG, takes previous line and moves it past ARG lines.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3769 With argument 0, interchanges line point is in with line mark is in."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3770 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3771 (transpose-subr (function
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3772 (lambda (arg)
20465
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
3773 (if (> arg 0)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3774 (progn
20465
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
3775 ;; Move forward over ARG lines,
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
3776 ;; but create newlines if necessary.
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
3777 (setq arg (forward-line arg))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
3778 (if (/= (preceding-char) ?\n)
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
3779 (setq arg (1+ arg)))
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
3780 (if (> arg 0)
de641c2459a6 (transpose-subr): Rewrite to make faster with big move
Andreas Schwab <schwab@suse.de>
parents: 20384
diff changeset
3781 (newline arg)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3782 (forward-line arg))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3783 arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3784
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3785 (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
3786 (let ((aux (if special mover
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3787 (lambda (x)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3788 (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
3789 (progn (funcall mover (- x)) (point))))))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3790 pos1 pos2)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3791 (cond
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3792 ((= arg 0)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3793 (save-excursion
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3794 (setq pos1 (funcall aux 1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3795 (goto-char (mark))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3796 (setq pos2 (funcall aux 1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3797 (transpose-subr-1 pos1 pos2))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3798 (exchange-point-and-mark))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3799 ((> arg 0)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3800 (setq pos1 (funcall aux -1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3801 (setq pos2 (funcall aux arg))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3802 (transpose-subr-1 pos1 pos2)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3803 (goto-char (car pos2)))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3804 (t
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3805 (setq pos1 (funcall aux -1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3806 (goto-char (car pos1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3807 (setq pos2 (funcall aux arg))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3808 (transpose-subr-1 pos1 pos2)))))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3809
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3810 (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
3811 (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
3812 (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
3813 (when (> (car pos1) (car pos2))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3814 (let ((swap pos1))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3815 (setq pos1 pos2 pos2 swap)))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3816 (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
3817 (atomic-change-group
49ff3106980b (undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 43032
diff changeset
3818 (let (word2)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
3819 ;; 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
3820 ;; 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
3821 (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
3822 (goto-char (car pos2))
49ff3106980b (undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 43032
diff changeset
3823 (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
3824 (goto-char (car pos1))
49ff3106980b (undo-get-state, undo-revert-to-state): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 43032
diff changeset
3825 (insert word2))))
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
3826
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
3827 (defun backward-word (&optional arg)
39110
9e2ff77fc88a (backward-word): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 39039
diff changeset
3828 "Move backward until encountering the beginning of a word.
32222
ae7e7e548bf3 (backward-word): Doc fix.
Dave Love <fx@gnu.org>
parents: 32203
diff changeset
3829 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
3830 (interactive "p")
52205
2f18cefc2997 (eval-expression): Use eval-last-sexp-print-value.
Richard M. Stallman <rms@gnu.org>
parents: 52046
diff changeset
3831 (forward-word (- (or arg 1))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3832
59178
abe8f4f2982c (mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents: 59162
diff changeset
3833 (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
3834 "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
3835 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
3836 move to with the same argument.
59178
abe8f4f2982c (mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents: 59162
diff changeset
3837 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
3838 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
3839 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
3840 (interactive "P\np")
abe8f4f2982c (mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents: 59162
diff changeset
3841 (cond ((and allow-extend
abe8f4f2982c (mark-word): New arg ALLOW-EXTEND
Richard M. Stallman <rms@gnu.org>
parents: 59162
diff changeset
3842 (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
3843 (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
3844 (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
3845 (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
3846 (set-mark
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3847 (save-excursion
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3848 (goto-char (mark))
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3849 (forward-word arg)
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3850 (point))))
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3851 (t
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3852 (push-mark
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3853 (save-excursion
58917
44dfc09c6b67 * simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents: 58754
diff changeset
3854 (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
3855 (point))
898b4b31410f * lisp/simple.el (mark-word): Mark more if repeated.
Kai Großjohann <kgrossjo@eu.uu.net>
parents: 43125
diff changeset
3856 nil t))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3857
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3858 (defun kill-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3859 "Kill characters forward until encountering the end of a word.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3860 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
3861 (interactive "p")
25400
c75839c09c84 (kill-word): Undo previous change.
Gerd Moellmann <gerd@gnu.org>
parents: 25342
diff changeset
3862 (kill-region (point) (progn (forward-word arg) (point))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3863
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3864 (defun backward-kill-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3865 "Kill characters backward until encountering the end of a word.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3866 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
3867 (interactive "p")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3868 (kill-word (- arg)))
2416
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
3869
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3870 (defun current-word (&optional strict really-word)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3871 "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
3872 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
3873 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
3874 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
3875 if there is no word nearby.
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3876 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
3877 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
3878 (save-excursion
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3879 (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
3880 (syntaxes (if really-word "w" "w_"))
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3881 (not-syntaxes (concat "^" syntaxes)))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3882 (skip-syntax-backward syntaxes) (setq start (point))
2416
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
3883 (goto-char oldpoint)
51802
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3884 (skip-syntax-forward syntaxes) (setq end (point))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3885 (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
3886 ;; 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
3887 (not strict))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3888 ;; Look for preceding word in same line.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3889 (skip-syntax-backward not-syntaxes
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3890 (save-excursion (beginning-of-line)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3891 (point)))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3892 (if (bolp)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3893 ;; No preceding word in same line.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3894 ;; Look for following word in same line.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3895 (progn
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3896 (skip-syntax-forward not-syntaxes
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3897 (save-excursion (end-of-line)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3898 (point)))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3899 (setq start (point))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3900 (skip-syntax-forward syntaxes)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3901 (setq end (point)))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3902 (setq end (point))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3903 (skip-syntax-backward syntaxes)
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3904 (setq start (point))))
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
3905 ;; 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
3906 (unless (= start end)
18379
1dd6f63f0ea3 (paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 18334
diff changeset
3907 (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
3908
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3909 (defcustom fill-prefix nil
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3910 "*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
3911 :type '(choice (const :tag "None" nil)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3912 string)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3913 :group 'fill)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3914 (make-variable-buffer-local 'fill-prefix)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3915
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3916 (defcustom auto-fill-inhibit-regexp nil
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3917 "*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
3918 :type '(choice (const :tag "None" nil)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3919 regexp)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
3920 :group 'fill)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3921
33781
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
3922 (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
3923 "*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
3924
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
3925 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
3926 The function should take a single optional argument, which is a flag
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
3927 indicating whether it should use soft newlines.
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
3928
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
3929 Setting this variable automatically makes it local to the current buffer.")
6fc804ec9434 (comment-line-break-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 19109
diff changeset
3930
21122
912cc3491589 (do-auto-fill): Obey fill-nobreak-predicate.
Richard M. Stallman <rms@gnu.org>
parents: 21074
diff changeset
3931 ;; 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
3932 ;; 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
3933 ;; 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
3934 ;; (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
3935 ;; but this one is the default one.)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3936 (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
3937 (let (fc justify give-up
12708
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
3938 (fill-prefix fill-prefix))
10471
3eb77f03f53e (do-auto-fill): justification renamed to current-justification.
Richard M. Stallman <rms@gnu.org>
parents: 10469
diff changeset
3939 (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
3940 (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
3941 (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
3942 (<= (current-column) fc))
55699
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
3943 (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
3944 (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
3945 (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
3946 nil ;; Auto-filling not required
10813
bccf0295c66e (open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents: 10805
diff changeset
3947 (if (memq justify '(full center right))
bccf0295c66e (open-line): indent when inserting fil-prefix.
Boris Goldowsky <boris@gnu.org>
parents: 10805
diff changeset
3948 (save-excursion (unjustify-current-line)))
12708
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
3949
1a81e79198c6 (do-auto-fill): Handle adaptive-fill-regexp.
Richard M. Stallman <rms@gnu.org>
parents: 12624
diff changeset
3950 ;; 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
3951 (when (and adaptive-fill-mode
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3952 (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
3953 (let ((prefix
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3954 (fill-context-prefix
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3955 (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
3956 (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
3957 (and prefix (not (equal prefix ""))
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3958 ;; 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
3959 (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
3960 (string-match "\\`[ \t]*\\'" prefix)))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
3961 (setq fill-prefix prefix))))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
3962
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
3963 (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
3964 ;; 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
3965 (let* (after-prefix
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
3966 (fill-point
55699
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
3967 (save-excursion
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
3968 (beginning-of-line)
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
3969 (setq after-prefix (point))
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
3970 (and fill-prefix
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
3971 (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
3972 (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
3973 (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
3974 (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
3975 (point))))
19343
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
3976
9427b0fcd9c1 (do-auto-fill): Better handling of a very long word
Richard M. Stallman <rms@gnu.org>
parents: 19326
diff changeset
3977 ;; 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
3978 (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
3979 (goto-char fill-point)
44505
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3980 (or (bolp)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3981 ;; 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
3982 (save-excursion (skip-chars-forward " ") (eolp))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3983 ;; 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
3984 ;; 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
3985 (and after-prefix (<= (point) after-prefix))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3986 ;; 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
3987 ;; 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
3988 (and comment-start-skip
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3989 (let ((limit (point)))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3990 (beginning-of-line)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3991 (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
3992 limit t)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3993 (eq (point) limit))))))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3994 ;; 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
3995 (setq give-up t)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3996 ;; 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
3997 (let ((prev-column (current-column)))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
3998 ;; 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
3999 ;; 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
4000 ;; 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
4001 (if (save-excursion
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4002 (skip-chars-backward " \t")
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4003 (= (point) fill-point))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4004 (funcall comment-line-break-function t)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4005 (save-excursion
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4006 (goto-char fill-point)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4007 (funcall comment-line-break-function t)))
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4008 ;; Now do justification, if required
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4009 (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
4010 (save-excursion
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4011 (end-of-line 0)
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4012 (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
4013 ;; 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
4014 ;; 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
4015 ;; trying again will not help.
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4016 (if (>= (current-column) prev-column)
76f93b741944 (line-move): Use memq rather than or.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44423
diff changeset
4017 (setq give-up t))))))
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
4018 ;; Justify last line.
15263
0d7899c372ed (do-auto-fill): Return t if real work was done.
Karl Heuer <kwzh@gnu.org>
parents: 15115
diff changeset
4019 (justify-current-line justify t t)
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
4020 t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4021
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
4022 (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
4023 "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
4024 Some major modes set this.")
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
4025
60645
b532848a1806 (auto-fill-function): Use the new :minor-mode-function property.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60619
diff changeset
4026 (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
4027 ;; 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
4028 ;; 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
4029 (defun auto-fill-mode (&optional arg)
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
4030 "Toggle Auto Fill mode.
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
4031 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
4032 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
4033 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
4034
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
4035 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
4036 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
4037 (interactive "P")
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
4038 (prog1 (setq auto-fill-function
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
4039 (if (if (null arg)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
4040 (not auto-fill-function)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
4041 (> (prefix-numeric-value arg) 0))
15836
aa83fbda6971 (normal-auto-fill-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 15605
diff changeset
4042 normal-auto-fill-function
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
4043 nil))
11572
09d49f6e0af9 (auto-fill-mode): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents: 11479
diff changeset
4044 (force-mode-line-update)))
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
4045
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
4046 ;; 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
4047 (defun auto-fill-function ()
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
4048 "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
4049 nil)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
4050
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
4051 (defun turn-on-auto-fill ()
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
4052 "Unconditionally turn on Auto Fill mode."
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
4053 (auto-fill-mode 1))
29808
fa2c8534a53a (turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29345
diff changeset
4054
fa2c8534a53a (turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29345
diff changeset
4055 (defun turn-off-auto-fill ()
fa2c8534a53a (turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29345
diff changeset
4056 "Unconditionally turn off Auto Fill mode."
fa2c8534a53a (turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29345
diff changeset
4057 (auto-fill-mode -1))
fa2c8534a53a (turn-off-auto-fill): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29345
diff changeset
4058
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
4059 (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
4060
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
4061 (defun set-fill-column (arg)
15431
68cca71d69bd (set-fill-column): Error if no argument.
Richard M. Stallman <rms@gnu.org>
parents: 15305
diff changeset
4062 "Set `fill-column' to specified argument.
23447
7ccd43d053fd (set-fill-column): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 23251
diff changeset
4063 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
4064 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
4065 (interactive "P")
17874
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
4066 (if (consp arg)
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
4067 (setq arg (current-column)))
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
4068 (if (not (integerp arg))
86e95716af6d (set-fill-column): Make the C-u case work.
Richard M. Stallman <rms@gnu.org>
parents: 17855
diff changeset
4069 ;; Disallow missing argument; it's probably a typo for C-x C-f.
52966
6fc70221e5c7 (overriding-map-is-bound, saved-overriding-map): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 52944
diff changeset
4070 (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
4071 (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
4072 (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
4073
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4074 (defun set-selective-display (arg)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
4075 "Set `selective-display' to ARG; clear it if no arg.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
4076 When the value of `selective-display' is a number > 0,
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
4077 lines whose indentation is >= that value are not displayed.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
4078 The variable `selective-display' has a separate value for each buffer."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4079 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4080 (if (eq selective-display t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4081 (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
4082 (let ((current-vpos
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
4083 (save-restriction
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
4084 (narrow-to-region (point-min) (point))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
4085 (goto-char (window-start))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
4086 (vertical-motion (window-height)))))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
4087 (setq selective-display
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
4088 (and arg (prefix-numeric-value arg)))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
4089 (recenter current-vpos))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4090 (set-window-start (selected-window) (window-start (selected-window)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4091 (princ "selective-display set to " t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4092 (prin1 selective-display t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4093 (princ "." t))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4094
48406
e670dd0e8087 (indicate-unused-lines, default-indicate-unused-lines): New variable aliases.
Richard M. Stallman <rms@gnu.org>
parents: 48234
diff changeset
4095 (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
4096 (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
4097
46175
9fa0c9140afa 2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 46092
diff changeset
4098 (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
4099 "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
4100 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
4101 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
4102 (interactive "P")
9fa0c9140afa 2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 46092
diff changeset
4103 (setq truncate-lines
9fa0c9140afa 2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 46092
diff changeset
4104 (if (null arg)
9fa0c9140afa 2002-07-04 Per Abrahamsen <abraham@dina.kvl.dk>
Per Abrahamsen <abraham@dina.kvl.dk>
parents: 46092
diff changeset
4105 (not truncate-lines)
46872
543ab39f153c (toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents: 46845
diff changeset
4106 (> (prefix-numeric-value arg) 0)))
543ab39f153c (toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents: 46845
diff changeset
4107 (force-mode-line-update)
48013
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
4108 (unless truncate-lines
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
4109 (let ((buffer (current-buffer)))
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
4110 (walk-windows (lambda (window)
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
4111 (if (eq buffer (window-buffer window))
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
4112 (set-window-hscroll window 0)))
d3416b0f856c (toggle-truncate-lines): When turning off truncation,
Richard M. Stallman <rms@gnu.org>
parents: 47599
diff changeset
4113 nil t)))
46872
543ab39f153c (toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents: 46845
diff changeset
4114 (message "Truncate long lines %s"
543ab39f153c (toggle-truncate-lines): Force redisplay. Display status message.
Richard M. Stallman <rms@gnu.org>
parents: 46845
diff changeset
4115 (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
4116
17471
f383bfae3202 (overwrite-mode-binary, overwrite-mode-textual): Use defvar.
Richard M. Stallman <rms@gnu.org>
parents: 17355
diff changeset
4117 (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
4118 "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
4119 (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
4120 "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
4121
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4122 (defun overwrite-mode (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4123 "Toggle overwrite mode.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4124 With arg, turn overwrite mode on iff arg is positive.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4125 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
4126 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
4127 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
4128 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
4129 \\[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
4130 is supposed to make it easier to insert characters when necessary."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4131 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4132 (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
4133 (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
4134 (> (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
4135 '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
4136 (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
4137
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
4138 (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
4139 "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
4140 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
4141 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
4142 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
4143 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
4144 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
4145 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
4146 \\[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
4147 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
4148
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
4149 Note that binary overwrite mode is not its own minor mode; it is a
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
4150 specialization of overwrite-mode, entered by setting the
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
4151 `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
4152 (interactive "P")
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
4153 (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
4154 (if (if (null arg)
2301
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
4155 (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
4156 (> (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
4157 '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
4158 (force-mode-line-update))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
4159
47408
2239db3433ca (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47364
diff changeset
4160 (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
4161 "Toggle Line Number mode.
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
4162 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
4163 When Line Number mode is enabled, the line number appears
23660
68edff9e7389 (line-number-mode): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23588
diff changeset
4164 in the mode line.
68edff9e7389 (line-number-mode): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23588
diff changeset
4165
38908
f917490db0d6 (line-number-mode): Mention the variable line-number-display-limit-width
Eli Zaretskii <eliz@gnu.org>
parents: 38847
diff changeset
4166 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
4167 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
4168 and `line-number-display-limit-width'."
47464
b8282a873821 (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47462
diff changeset
4169 :init-value t :global t :group 'editing-basics :require nil)
47408
2239db3433ca (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47364
diff changeset
4170
2239db3433ca (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47364
diff changeset
4171 (define-minor-mode column-number-mode
12565
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
4172 "Toggle Column Number mode.
c0a5d0d00c18 (shell-command): Use save-match-data.
Karl Heuer <kwzh@gnu.org>
parents: 12483
diff changeset
4173 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
4174 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
4175 in the mode line."
47464
b8282a873821 (transient-mark-mode, line-number-mode, column-number-mode):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47462
diff changeset
4176 :global t :group 'editing-basics :require nil)
52464
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
4177
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
4178 (define-minor-mode size-indication-mode
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
4179 "Toggle Size Indication mode.
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
4180 With arg, turn Size Indication mode on iff arg is positive. When
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
4181 Size Indication mode is enabled, the size of the accessible part
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
4182 of the buffer appears in the mode line."
3e7ed05e4684 (size-indication-mode): New.
Lute Kamstra <lute@gnu.org>
parents: 52401
diff changeset
4183 :global t :group 'editing-basics :require nil)
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
4184
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
4185 (defgroup paren-blinking nil
18379
1dd6f63f0ea3 (paren-blinking group): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 18334
diff changeset
4186 "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
4187 :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
4188 :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
4189
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4190 (defcustom blink-matching-paren t
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4191 "*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
4192 :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
4193 :group 'paren-blinking)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4194
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4195 (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
4196 "*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
4197 If nil, means don't show it (but the open-paren can still be shown
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
4198 when it is off screen)."
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4199 :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
4200 :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
4201
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
4202 (defcustom blink-matching-paren-distance (* 25 1024)
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4203 "*If non-nil, is maximum distance to search for matching open-paren."
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4204 :type 'integer
18334
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
4205 :group 'paren-blinking)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4206
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4207 (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
4208 "*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
4209 :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
4210 :group 'paren-blinking)
9771
3a51735d4a55 (blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9750
diff changeset
4211
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4212 (defcustom blink-matching-paren-dont-ignore-comments nil
18334
d03c1b315e76 Create paren-blinking custom group and put all blink-matching-paren variables in it.
Simon Marshall <simon@gnu.org>
parents: 18189
diff changeset
4213 "*Non-nil means `blink-matching-paren' will not ignore comments."
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4214 :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
4215 :group 'paren-blinking)
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
4216
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4217 (defun blink-matching-open ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4218 "Move cursor momentarily to the beginning of the sexp before point."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4219 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4220 (and (> (point) (1+ (point-min)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4221 blink-matching-paren
9749
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
4222 ;; Verify an even number of quoting characters precede the close.
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
4223 (= 1 (logand 1 (- (point)
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
4224 (save-excursion
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
4225 (forward-char -1)
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
4226 (skip-syntax-backward "/\\")
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
4227 (point)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4228 (let* ((oldpos (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4229 (blinkpos)
52367
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
4230 (mismatch)
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
4231 matching-paren)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4232 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4233 (save-restriction
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4234 (if blink-matching-paren-distance
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4235 (narrow-to-region (max (point-min)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4236 (- (point) blink-matching-paren-distance))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4237 oldpos))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4238 (condition-case ()
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
4239 (let ((parse-sexp-ignore-comments
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
4240 (and parse-sexp-ignore-comments
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
4241 (not blink-matching-paren-dont-ignore-comments))))
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
4242 (setq blinkpos (scan-sexps oldpos -1)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4243 (error nil)))
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
4244 (and blinkpos
61671
c0bf74e7fc30 (blink-matching-open): Fix botched commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61670
diff changeset
4245 ;; Not syntax '$'.
c0bf74e7fc30 (blink-matching-open): Fix botched commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61670
diff changeset
4246 (not (eq (syntax-class (syntax-after blinkpos)) 8))
52367
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
4247 (setq matching-paren
58754
b41534d7c63c (blink-matching-open): Obey syntax-table text properties.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58625
diff changeset
4248 (let ((syntax (syntax-after blinkpos)))
b41534d7c63c (blink-matching-open): Obey syntax-table text properties.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58625
diff changeset
4249 (and (consp syntax)
61670
c1e3fbdb9d71 (blink-matching-open): Use it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 61651
diff changeset
4250 (eq (syntax-class syntax) 4)
58754
b41534d7c63c (blink-matching-open): Obey syntax-table text properties.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 58625
diff changeset
4251 (cdr syntax)))
52367
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
4252 mismatch
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
4253 (or (null matching-paren)
12893
3ae9326907aa (blink-matching-paren-dont-ignore-comments): New var.
Richard M. Stallman <rms@gnu.org>
parents: 12838
diff changeset
4254 (/= (char-after (1- oldpos))
52367
535dab9cd1c1 (blink-matching-open): Work correctly on chars that
Richard M. Stallman <rms@gnu.org>
parents: 52205
diff changeset
4255 matching-paren))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4256 (if mismatch (setq blinkpos nil))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4257 (if blinkpos
23251
f19f44b54f00 (blink-matching-open): Don't log paren matching
Karl Heuer <kwzh@gnu.org>
parents: 22877
diff changeset
4258 ;; Don't log messages about paren matching.
f19f44b54f00 (blink-matching-open): Don't log paren matching
Karl Heuer <kwzh@gnu.org>
parents: 22877
diff changeset
4259 (let (message-log-max)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4260 (goto-char blinkpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4261 (if (pos-visible-in-window-p)
13810
64679d67fde9 (blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 13587
diff changeset
4262 (and blink-matching-paren-on-screen
64679d67fde9 (blink-matching-paren-on-screen): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 13587
diff changeset
4263 (sit-for blink-matching-delay))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4264 (goto-char blinkpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4265 (message
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4266 "Matches %s"
6539
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
4267 ;; Show what precedes the open in its line, if anything.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4268 (if (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4269 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4270 (not (bolp)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4271 (buffer-substring (progn (beginning-of-line) (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4272 (1+ blinkpos))
6539
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
4273 ;; Show what follows the open in its line, if anything.
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
4274 (if (save-excursion
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
4275 (forward-char 1)
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
4276 (skip-chars-forward " \t")
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
4277 (not (eolp)))
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
4278 (buffer-substring blinkpos
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
4279 (progn (end-of-line) (point)))
9434
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4280 ;; Otherwise show the previous nonblank line,
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4281 ;; if there is one.
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4282 (if (save-excursion
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4283 (skip-chars-backward "\n \t")
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4284 (not (bobp)))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4285 (concat
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4286 (buffer-substring (progn
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4287 (skip-chars-backward "\n \t")
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4288 (beginning-of-line)
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4289 (point))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4290 (progn (end-of-line)
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4291 (skip-chars-backward " \t")
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4292 (point)))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4293 ;; Replace the newline and other whitespace with `...'.
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4294 "..."
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4295 (buffer-substring blinkpos (1+ blinkpos)))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4296 ;; There is nothing to show except the char itself.
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
4297 (buffer-substring blinkpos (1+ blinkpos))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4298 (cond (mismatch
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4299 (message "Mismatched parentheses"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4300 ((not blink-matching-paren-distance)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4301 (message "Unmatched parenthesis"))))))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4302
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4303 ;Turned off because it makes dbx bomb out.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4304 (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
4305
2805
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
4306 ;; 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
4307 ;; 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
4308 ;; that happens in the QUIT macro at the C code level.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4309 (defun keyboard-quit ()
22304
f322afba9154 (keyboard-quit): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 22257
diff changeset
4310 "Signal a `quit' condition.
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
4311 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
4312 At top-level, as an editor command, this simply beeps."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4313 (interactive)
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
4314 (deactivate-mark)
57853
d50014ac219f (keyboard-quit): Call kmacro-keyboard-quit.
Kim F. Storm <storm@cua.dk>
parents: 57688
diff changeset
4315 (if (fboundp 'kmacro-keyboard-quit)
d50014ac219f (keyboard-quit): Call kmacro-keyboard-quit.
Kim F. Storm <storm@cua.dk>
parents: 57688
diff changeset
4316 (kmacro-keyboard-quit))
47353
6979a589f9c7 (keyboard-quit): Set defining-kbd-macro to nil to
Kim F. Storm <storm@cua.dk>
parents: 47346
diff changeset
4317 (setq defining-kbd-macro nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4318 (signal 'quit nil))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4319
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
4320 (defvar buffer-quit-function nil
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
4321 "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
4322 \\[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
4323 \(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
4324
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
4325 (defun keyboard-escape-quit ()
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
4326 "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
4327 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
4328 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
4329 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
4330 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
4331 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
4332 (interactive)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
4333 (cond ((eq last-command 'mode-exited) nil)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
4334 ((> (minibuffer-depth) 0)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
4335 (abort-recursive-edit))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
4336 (current-prefix-arg
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
4337 nil)
58917
44dfc09c6b67 * simple.el (beginning-of-buffer, end-of-buffer):
Juri Linkov <juri@jurta.org>
parents: 58754
diff changeset
4338 ((and transient-mark-mode mark-active)
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
4339 (deactivate-mark))
17355
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
4340 ((> (recursion-depth) 0)
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
4341 (exit-recursive-edit))
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
4342 (buffer-quit-function
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
4343 (funcall buffer-quit-function))
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
4344 ((not (one-window-p t))
17355
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
4345 (delete-other-windows))
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
4346 ((string-match "^ \\*" (buffer-name (current-buffer)))
dc683d40dde5 (keyboard-escape-quit): Exit recursive edits,
Richard M. Stallman <rms@gnu.org>
parents: 17276
diff changeset
4347 (bury-buffer))))
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
4348
44252
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
4349 (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
4350 "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
4351 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
4352 specification for `play-sound'."
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
4353 (interactive "fPlay sound file: ")
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
4354 (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
4355 (if volume
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
4356 (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
4357 (if device
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
4358 (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
4359 (push 'sound sound)
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
4360 (play-sound sound)))
0cdafef85267 (play-sound-file): Moved from subr.el, made unconditional.
Richard M. Stallman <rms@gnu.org>
parents: 44208
diff changeset
4361
59567
638fd0a9f545 (just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents: 59486
diff changeset
4362
27234
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
4363 (defcustom read-mail-command 'rmail
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
4364 "*Your preference for a mail reading package.
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4365 This is used by some keybindings which support reading mail.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4366 See also `mail-user-agent' concerning sending mail."
27234
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
4367 :type '(choice (function-item rmail)
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
4368 (function-item gnus)
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
4369 (function-item mh-rmail)
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
4370 (function :tag "Other"))
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
4371 :version "21.1"
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
4372 :group 'mail)
bf32d38f9721 (with-syntax-table): Fix backquoting.
Dave Love <fx@gnu.org>
parents: 27096
diff changeset
4373
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4374 (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
4375 "*Your preference for a mail composition package.
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4376 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
4377 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
4378 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
4379
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
4380 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
4381
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4382 `sendmail-user-agent' -- use the default Emacs Mail package.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4383 See Info node `(emacs)Sending Mail'.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4384 `mh-e-user-agent' -- use the Emacs interface to the MH mail system.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4385 See Info node `(mh-e)'.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4386 `message-user-agent' -- use the Gnus Message package.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4387 See Info node `(message)'.
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4388 `gnus-user-agent' -- like `message-user-agent', but with Gnus
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4389 paraphernalia, particularly the Gcc: header for
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4390 archiving.
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
4391
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
4392 Additional valid symbols may be available; check with the author of
34687
48e5a31a2ff0 (mail-user-agent): Doc fix.
Dave Love <fx@gnu.org>
parents: 34619
diff changeset
4393 your package for details. The function should return non-nil if it
48e5a31a2ff0 (mail-user-agent): Doc fix.
Dave Love <fx@gnu.org>
parents: 34619
diff changeset
4394 succeeds.
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4395
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4396 See also `read-mail-command' concerning reading mail."
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4397 :type '(radio (function-item :tag "Default Emacs mail"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4398 :format "%t\n"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4399 sendmail-user-agent)
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4400 (function-item :tag "Emacs interface to MH"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4401 :format "%t\n"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4402 mh-e-user-agent)
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4403 (function-item :tag "Gnus Message package"
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4404 :format "%t\n"
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4405 message-user-agent)
31573
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4406 (function-item :tag "Gnus Message with full Gnus features"
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4407 :format "%t\n"
eea697d7588c (read-mail-command): Doc fix.
Dave Love <fx@gnu.org>
parents: 30820
diff changeset
4408 gnus-user-agent)
17663
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4409 (function :tag "Other"))
d2c64a1563f7 Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents: 17662
diff changeset
4410 :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
4411
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
4412 (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
4413 '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
4414 '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
4415
21906
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
4416 (defun rfc822-goto-eoh ()
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
4417 ;; 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
4418 (goto-char (point-min))
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4419 (when (re-search-forward
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
4420 "^\\([:\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
4421 (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
4422
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4423 (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
4424 switch-function yank-action
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4425 send-actions)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4426 (if switch-function
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4427 (let ((special-display-buffer-names nil)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4428 (special-display-regexps nil)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4429 (same-window-buffer-names nil)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4430 (same-window-regexps nil))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4431 (funcall switch-function "*mail*")))
53411
f0c057d16a15 (sendmail-user-agent-compose): Use assoc-string.
Richard M. Stallman <rms@gnu.org>
parents: 53097
diff changeset
4432 (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
4433 (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
4434 (body (cdr (assoc-string "body" other-headers t))))
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4435 (or (mail continue to subject in-reply-to cc yank-action send-actions)
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4436 continue
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4437 (error "Message aborted"))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4438 (save-excursion
21906
2ee50035ee1b (rfc822-goto-eoh): Stop at a blank line, too.
Richard M. Stallman <rms@gnu.org>
parents: 21847
diff changeset
4439 (rfc822-goto-eoh)
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4440 (while other-headers
28491
3e21859cd0e7 (sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents: 28193
diff changeset
4441 (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
4442 '("in-reply-to" "cc" "body"))
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4443 (insert (car (car other-headers)) ": "
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4444 (cdr (car other-headers)) "\n"))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4445 (setq other-headers (cdr other-headers)))
28491
3e21859cd0e7 (sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents: 28193
diff changeset
4446 (when body
3e21859cd0e7 (sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents: 28193
diff changeset
4447 (forward-line 1)
3e21859cd0e7 (sendmail-user-agent-compose): Recognize a `body'
Gerd Moellmann <gerd@gnu.org>
parents: 28193
diff changeset
4448 (insert body))
18629
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4449 t)))
fbb38f6bf8dc (sendmail-user-agent-compose): New function;
Richard M. Stallman <rms@gnu.org>
parents: 18618
diff changeset
4450
15988
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
4451 (define-mail-user-agent 'mh-e-user-agent
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
4452 'mh-smail-batch 'mh-send-letter 'mh-fully-kill-draft
6a1a664be9f6 (do-auto-fill): Do break after one word as last resort
Richard M. Stallman <rms@gnu.org>
parents: 15892
diff changeset
4453 'mh-before-send-letter-hook)
16632
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
4454
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
4455 (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
4456 switch-function yank-action send-actions)
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
4457 "Start composing a mail message to send.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
4458 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
4459 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
4460 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
4461 and the initial Subject field, respectively.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
4462
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
4463 OTHER-HEADERS is an alist specifying additional
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
4464 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
4465 HEADER and VALUE are strings.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
4466
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
4467 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
4468 being composed.
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
4469
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
4470 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
4471 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
4472
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
4473 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
4474 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
4475 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
4476 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
4477 \(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
4478 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
4479
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
4480 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
4481 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
4482 (interactive
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
4483 (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
4484 (let ((function (get mail-user-agent 'composefunc)))
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
4485 (funcall function to subject other-headers continue
5dd86f31843a (compose-mail): Handle several more args:
Richard M. Stallman <rms@gnu.org>
parents: 16624
diff changeset
4486 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
4487
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
4488 (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
4489 yank-action send-actions)
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
4490 "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
4491 (interactive
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
4492 (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
4493 (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
4494 '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
4495
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
4496
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
4497 (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
4498 yank-action send-actions)
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
4499 "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
4500 (interactive
1a6a798242d6 (compose-mail): Make prefix arg mean "continue".
Richard M. Stallman <rms@gnu.org>
parents: 17589
diff changeset
4501 (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
4502 (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
4503 '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
4504
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
4505 (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
4506 "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
4507
46845
e06b5768debd (set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents: 46647
diff changeset
4508 (defun set-variable (var val &optional make-local)
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
4509 "Set VARIABLE to VALUE. VALUE is a Lisp object.
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
4510 When using this interactively, enter a Lisp object for VALUE.
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
4511 If you want VALUE to be a string, you must surround it with doublequotes.
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
4512 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
4513
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
4514 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
4515 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
4516
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
4517 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
4518 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
4519
e06b5768debd (set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents: 46647
diff changeset
4520 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
4521 (interactive
7c92848a9d80 (set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents: 22144
diff changeset
4522 (let* ((default-var (variable-at-point))
7c92848a9d80 (set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents: 22144
diff changeset
4523 (var (if (symbolp default-var)
7c92848a9d80 (set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents: 22144
diff changeset
4524 (read-variable (format "Set variable (default %s): " default-var)
7c92848a9d80 (set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents: 22144
diff changeset
4525 default-var)
7c92848a9d80 (set-variable): Offer variable at point as default.
Richard M. Stallman <rms@gnu.org>
parents: 22144
diff changeset
4526 (read-variable "Set variable: ")))
53097
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4527 (minibuffer-help-form '(describe-variable var))
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4528 (prop (get var 'variable-interactive))
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4529 (prompt (format "Set %s%s to value: " var
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4530 (cond ((local-variable-p var)
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4531 " (buffer-local)")
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4532 ((or current-prefix-arg
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4533 (local-variable-if-set-p var))
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4534 " buffer-locally")
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4535 (t " globally"))))
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4536 (val (if prop
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4537 ;; Use VAR's `variable-interactive' property
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4538 ;; as an interactive spec for prompting.
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4539 (call-interactively `(lambda (arg)
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4540 (interactive ,prop)
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4541 arg))
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4542 (read
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4543 (read-string prompt nil
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4544 'set-variable-value-history)))))
bb31cf348e05 (set-variable): Fix indentation.
Andreas Schwab <schwab@suse.de>
parents: 52966
diff changeset
4545 (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
4546
49103
7c84e7bb3879 (set-variable): Load deps of custom variables without type.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 49066
diff changeset
4547 (and (custom-variable-p var)
7c84e7bb3879 (set-variable): Load deps of custom variables without type.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 49066
diff changeset
4548 (not (get var 'custom-type))
7c84e7bb3879 (set-variable): Load deps of custom variables without type.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 49066
diff changeset
4549 (custom-load-symbol var))
17613
7dadfa677617 (set-variable): Simplify previous change.
Richard M. Stallman <rms@gnu.org>
parents: 17606
diff changeset
4550 (let ((type (get var 'custom-type)))
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
4551 (when type
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
4552 ;; Match with custom type.
38432
4bbb59858499 (set-variable): Require 'cus-edit' instead of
Gerd Moellmann <gerd@gnu.org>
parents: 38027
diff changeset
4553 (require 'cus-edit)
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
4554 (setq type (widget-convert type))
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
4555 (unless (widget-apply type :match val)
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
4556 (error "Value `%S' does not match type %S of %S"
17606
d8cd49a0529c (set-variable): Check VALUE against type info if available.
Richard M. Stallman <rms@gnu.org>
parents: 17594
diff changeset
4557 val (car type) var))))
46845
e06b5768debd (set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents: 46647
diff changeset
4558
e06b5768debd (set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents: 46647
diff changeset
4559 (if make-local
e06b5768debd (set-variable): If given a prefix argument, set variable buffer-locally.
Richard M. Stallman <rms@gnu.org>
parents: 46647
diff changeset
4560 (make-local-variable var))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
4561
35203
dcf1f0621dbb (set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents: 34909
diff changeset
4562 (set var val)
dcf1f0621dbb (set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents: 34909
diff changeset
4563
dcf1f0621dbb (set-variable): Force a thorough redisplay for the
Gerd Moellmann <gerd@gnu.org>
parents: 34909
diff changeset
4564 ;; 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
4565 ;; 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
4566 (force-mode-line-update))
59567
638fd0a9f545 (just-one-space): Argument specifies number of spaces.
Richard M. Stallman <rms@gnu.org>
parents: 59486
diff changeset
4567
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4568 ;; Define the major mode for lists of completions.
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
4569
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
4570 (defvar completion-list-mode-map nil
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
4571 "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
4572 (or completion-list-mode-map
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4573 (let ((map (make-sparse-keymap)))
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4574 (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
4575 (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
4576 (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
4577 (define-key map "\C-m" 'choose-completion)
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
4578 (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
4579 (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
4580 (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
4581 (setq completion-list-mode-map map)))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4582
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4583 ;; 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
4584 (put 'completion-list-mode 'mode-class 'special)
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4585
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
4586 (defvar completion-reference-buffer nil
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
4587 "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
4588 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
4589 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
4590
16924
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
4591 (defvar completion-no-auto-exit nil
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
4592 "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
4593 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
4594 and `mouse-choose-completion'.")
231033e9a053 (completion-no-auto-exit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 16851
diff changeset
4595
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
4596 (defvar completion-base-size nil
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
4597 "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
4598 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
4599 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
4600 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
4601 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
4602
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
4603 (defun delete-completion-window ()
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
4604 "Delete the completion list window.
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
4605 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
4606 (interactive)
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
4607 (let ((buf completion-reference-buffer))
16851
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
4608 (if (one-window-p t)
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
4609 (if (window-dedicated-p (selected-window))
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
4610 (delete-frame (selected-frame)))
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
4611 (delete-window (selected-window))
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
4612 (if (get-buffer-window buf)
a689a6716261 (delete-completion-window): Handle special display frames.
Richard M. Stallman <rms@gnu.org>
parents: 16803
diff changeset
4613 (select-window (get-buffer-window buf))))))
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
4614
10284
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
4615 (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
4616 "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
4617 (interactive "p")
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
4618 (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
4619
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
4620 (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
4621 "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
4622 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
4623 (interactive "p")
33781
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
4624 (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
4625 (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
4626 ;; 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
4627 (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
4628 (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
4629 ;; 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
4630 (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
4631 (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
4632 (setq n (1- n)))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
4633 (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
4634 (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
4635 ;; 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
4636 (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
4637 (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
4638 (point) 'mouse-face nil beg)))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
4639 ;; 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
4640 (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
4641 (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
4642 (point) 'mouse-face nil beg)))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
4643 ;; 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
4644 (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
4645 (point) 'mouse-face nil beg))
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
4646 (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
4647
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4648 (defun choose-completion ()
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4649 "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
4650 (interactive)
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
4651 (let (beg end completion (buffer completion-reference-buffer)
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
4652 (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
4653 (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
4654 (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
4655 (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
4656 (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
4657 (if (null beg)
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
4658 (error "No completion here"))
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
4659 (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
4660 (setq end (or (next-single-property-change end 'mouse-face) (point-max)))
8468
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
4661 (setq completion (buffer-substring beg end))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
4662 (let ((owindow (selected-window)))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
4663 (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
4664 (window-dedicated-p (selected-window)))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
4665 ;; 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
4666 (iconify-frame (selected-frame))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
4667 (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
4668 (bury-buffer)))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
4669 (select-window owindow))
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
4670 (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
4671
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4672 ;; 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
4673 ;; that can be found before POINT.
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4674 (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
4675 (let ((opoint (point))
46516
25e7debccc64 (choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents: 46409
diff changeset
4676 len)
25e7debccc64 (choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents: 46409
diff changeset
4677 ;; 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
4678 (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
4679 (minibuffer-prompt-end)))
25e7debccc64 (choose-completion-delete-max-match): Handle minibuffer prompts explicitly.
Richard M. Stallman <rms@gnu.org>
parents: 46409
diff changeset
4680 ;; 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
4681 ;; 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
4682 (setq len (- opoint (point)))
7574
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
4683 (if completion-ignore-case
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
4684 (setq string (downcase string)))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4685 (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
4686 (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
4687 (if completion-ignore-case
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
4688 (setq tail (downcase tail)))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4689 (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
4690 (setq len (1- len))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4691 (forward-char 1))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4692 (delete-char len)))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4693
45607
98941f178aa2 (choose-completion-string-functions): New special hook.
Kim F. Storm <storm@cua.dk>
parents: 45586
diff changeset
4694 (defvar choose-completion-string-functions nil
45612
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4695 "Functions that may override the normal insertion of a completion choice.
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4696 These functions are called in order with four arguments:
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4697 CHOICE - the string to insert in the buffer,
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4698 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
4699 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
4700 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
4701 the string being completed.
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4702
45612
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4703 If a function in the list returns non-nil, that function is supposed
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4704 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
4705 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
4706
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4707 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
4708 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
4709
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
4710 (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
4711 "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
4712 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
4713 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
4714 to decide what to delete."
45615
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4715
58054a96d922 (choose-completion-string-functions): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 45612
diff changeset
4716 ;; 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
4717 ;; 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
4718 ;; 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
4719
52046
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
4720 (let* ((buffer (or buffer completion-reference-buffer))
6718a30c3752 (choose-completion-string): Use `minibufferp';
John Paul Wallington <jpw@pobox.com>
parents: 51957
diff changeset
4721 (mini-p (minibufferp buffer)))
7333
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
4722 ;; 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
4723 ;; active minibuffer.
27050
5c0c5089979c (choose-completion-string): In minibuffer,
Richard M. Stallman <rms@gnu.org>
parents: 26884
diff changeset
4724 (if (and mini-p
11159
edf66df6fbe9 (choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents: 11140
diff changeset
4725 (or (not (active-minibuffer-window))
edf66df6fbe9 (choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents: 11140
diff changeset
4726 (not (equal buffer
edf66df6fbe9 (choose-completion-string): Use active-minibuffer-window.
Richard M. Stallman <rms@gnu.org>
parents: 11140
diff changeset
4727 (window-buffer (active-minibuffer-window))))))
7333
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
4728 (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
4729 ;; 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
4730 (set-buffer buffer)
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
4731 (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
4732 'choose-completion-string-functions
8287dca5eb2d (what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47316
diff changeset
4733 choice buffer mini-p base-size)
8287dca5eb2d (what-line): Don't hard-code 1.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47316
diff changeset
4734 ;; Insert the completion into the buffer where it was requested.
45612
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4735 (if base-size
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4736 (delete-region (+ base-size (if mini-p
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4737 (minibuffer-prompt-end)
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4738 (point-min)))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4739 (point))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4740 (choose-completion-delete-max-match choice))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4741 (insert choice)
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4742 (remove-text-properties (- (point) (length choice)) (point)
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4743 '(mouse-face nil))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4744 ;; Update point in the window that BUFFER is showing in.
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4745 (let ((window (get-buffer-window buffer t)))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4746 (set-window-point window (point)))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4747 ;; If completing for the minibuffer, exit it with this choice.
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4748 (and (not completion-no-auto-exit)
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4749 (equal buffer (window-buffer (minibuffer-window)))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4750 minibuffer-completion-table
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4751 ;; If this is reading a file name, and the file name chosen
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4752 ;; is a directory, don't exit the minibuffer.
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4753 (if (and (eq minibuffer-completion-table 'read-file-name-internal)
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4754 (file-directory-p (field-string (point-max))))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4755 (let ((mini (active-minibuffer-window)))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4756 (select-window mini)
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4757 (when minibuffer-auto-raise
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4758 (raise-frame (window-frame mini))))
e1b3f85895a5 Reworked 2001-06-01 change.
Kim F. Storm <storm@cua.dk>
parents: 45607
diff changeset
4759 (exit-minibuffer)))))))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4760
4217
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
4761 (defun completion-list-mode ()
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4762 "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
4763 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
4764 to select the completion near point.
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4765 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
4766 with the mouse."
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4767 (interactive)
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4768 (kill-all-local-variables)
4217
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
4769 (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
4770 (setq mode-name "Completion List")
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
4771 (setq major-mode 'completion-list-mode)
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
4772 (make-local-variable 'completion-base-size)
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
4773 (setq completion-base-size nil)
62739
1c2cba6e4010 (completion-list-mode): Use run-mode-hooks.
Lute Kamstra <lute@gnu.org>
parents: 62632
diff changeset
4774 (run-mode-hooks 'completion-list-mode-hook))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4775
37300
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
4776 (defun completion-list-mode-finish ()
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
4777 "Finish setup of the completions buffer.
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
4778 Called from `temp-buffer-show-hook'."
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
4779 (when (eq major-mode 'completion-list-mode)
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
4780 (toggle-read-only 1)))
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
4781
76c94d3124d6 (completion-list-mode-finish): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37248
diff changeset
4782 (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
4783
20482
1fe822fa93e6 (completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents: 20465
diff changeset
4784 (defvar completion-setup-hook nil
1fe822fa93e6 (completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents: 20465
diff changeset
4785 "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
4786 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
4787 command to display the completion list buffer was run.
1fe822fa93e6 (completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents: 20465
diff changeset
4788 The completion list buffer is available as the value of `standard-output'.")
1fe822fa93e6 (completion-setup-hook): Add definition.
Richard M. Stallman <rms@gnu.org>
parents: 20465
diff changeset
4789
11313
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
4790 ;; This function goes in completion-setup-hook, so that it is called
5704f8216dbd (completion-setup-function): Undo March 11 change.
Richard M. Stallman <rms@gnu.org>
parents: 11235
diff changeset
4791 ;; after the text of the completion list buffer is written.
54910
2ac3325ab7ec (completions-common-part): Rename from completion-de-emphasis.
Masatake YAMATO <jet@gyve.org>
parents: 54909
diff changeset
4792 (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
4793 '((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
4794 "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
4795 :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
4796
54910
2ac3325ab7ec (completions-common-part): Rename from completion-de-emphasis.
Masatake YAMATO <jet@gyve.org>
parents: 54909
diff changeset
4797 (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
4798 '((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
4799 "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
4800 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
4801 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
4802 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
4803 :group 'completion)
8203
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
4804
56613
05c3cf703d59 (completion-root-regexp): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56505
diff changeset
4805 ;; 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
4806 ;; 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
4807 ;; to their liking
05c3cf703d59 (completion-root-regexp): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56505
diff changeset
4808 (defvar completion-root-regexp "^/"
05c3cf703d59 (completion-root-regexp): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56505
diff changeset
4809 "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
4810
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4811 (defun completion-setup-function ()
55699
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
4812 (let ((mainbuf (current-buffer))
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
4813 (mbuf-contents (minibuffer-contents)))
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
4814 ;; 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
4815 ;; 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
4816 ;; 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
4817 (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
4818 (with-current-buffer mainbuf
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
4819 (setq default-directory (file-name-directory mbuf-contents))))
56505
f02b482121bc (completion-setup-function): Compute the common parts
Eli Zaretskii <eliz@gnu.org>
parents: 56432
diff changeset
4820 ;; If partial-completion-mode is on, point might not be after the
f02b482121bc (completion-setup-function): Compute the common parts
Eli Zaretskii <eliz@gnu.org>
parents: 56432
diff changeset
4821 ;; last character in the minibuffer.
f02b482121bc (completion-setup-function): Compute the common parts
Eli Zaretskii <eliz@gnu.org>
parents: 56432
diff changeset
4822 ;; FIXME: This still doesn't work if the text to be completed
f02b482121bc (completion-setup-function): Compute the common parts
Eli Zaretskii <eliz@gnu.org>
parents: 56432
diff changeset
4823 ;; starts with a `-'.
f02b482121bc (completion-setup-function): Compute the common parts
Eli Zaretskii <eliz@gnu.org>
parents: 56432
diff changeset
4824 (when (and partial-completion-mode (not (eobp)))
f02b482121bc (completion-setup-function): Compute the common parts
Eli Zaretskii <eliz@gnu.org>
parents: 56432
diff changeset
4825 (setq mbuf-contents
f02b482121bc (completion-setup-function): Compute the common parts
Eli Zaretskii <eliz@gnu.org>
parents: 56432
diff changeset
4826 (substring mbuf-contents 0 (- (point) (point-max)))))
55699
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
4827 (with-current-buffer standard-output
6160
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
4828 (completion-list-mode)
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
4829 (make-local-variable 'completion-reference-buffer)
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
4830 (setq completion-reference-buffer mainbuf)
48628
113fc3ea0bfb (completion-setup-function): Fix last change to use
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 48620
diff changeset
4831 (if minibuffer-completing-file-name
18034
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
4832 ;; For file name completion,
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
4833 ;; use the number of chars before the start of the
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
4834 ;; last file name component.
0d96c759902b (line-move): If moving into intangible text,
Richard M. Stallman <rms@gnu.org>
parents: 17874
diff changeset
4835 (setq completion-base-size
55699
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
4836 (with-current-buffer mainbuf
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
4837 (save-excursion
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
4838 (goto-char (point-max))
56613
05c3cf703d59 (completion-root-regexp): New defvar.
Eli Zaretskii <eliz@gnu.org>
parents: 56505
diff changeset
4839 (skip-chars-backward completion-root-regexp)
55699
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
4840 (- (point) (minibuffer-prompt-end)))))
19227
84c681e58fd5 (completion-setup-function): Don't set completion-base-size
Richard M. Stallman <rms@gnu.org>
parents: 19160
diff changeset
4841 ;; Otherwise, in minibuffer, the whole input is being completed.
55699
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
4842 (if (minibufferp mainbuf)
63063
a473771b436f (completion-setup-function): Look for completion-base-size-function
Richard M. Stallman <rms@gnu.org>
parents: 63037
diff changeset
4843 (if (and (symbolp minibuffer-completion-table)
a473771b436f (completion-setup-function): Look for completion-base-size-function
Richard M. Stallman <rms@gnu.org>
parents: 63037
diff changeset
4844 (get minibuffer-completion-table 'completion-base-size-function))
a473771b436f (completion-setup-function): Look for completion-base-size-function
Richard M. Stallman <rms@gnu.org>
parents: 63037
diff changeset
4845 (setq completion-base-size
a473771b436f (completion-setup-function): Look for completion-base-size-function
Richard M. Stallman <rms@gnu.org>
parents: 63037
diff changeset
4846 (funcall (get minibuffer-completion-table 'completion-base-size-function)))
a473771b436f (completion-setup-function): Look for completion-base-size-function
Richard M. Stallman <rms@gnu.org>
parents: 63037
diff changeset
4847 (setq completion-base-size 0))))
55699
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
4848 ;; Put faces on first uncommon characters and common parts.
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
4849 (when completion-base-size
55699
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
4850 (let* ((common-string-length
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
4851 (- (length mbuf-contents) completion-base-size))
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
4852 (element-start (next-single-property-change
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
4853 (point-min)
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
4854 'mouse-face))
55699
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
4855 (element-common-end
60007
bfdc24654127 (eval-expression-print-format): Avoid warning about edebug-active.
Richard M. Stallman <rms@gnu.org>
parents: 59996
diff changeset
4856 (and element-start
bfdc24654127 (eval-expression-print-format): Avoid warning about edebug-active.
Richard M. Stallman <rms@gnu.org>
parents: 59996
diff changeset
4857 (+ (or element-start nil) common-string-length)))
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
4858 (maxp (point-max)))
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
4859 (while (and element-start (< element-common-end maxp))
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
4860 (when (and (get-char-property element-start 'mouse-face)
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
4861 (get-char-property element-common-end 'mouse-face))
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
4862 (put-text-property element-start element-common-end
54910
2ac3325ab7ec (completions-common-part): Rename from completion-de-emphasis.
Masatake YAMATO <jet@gyve.org>
parents: 54909
diff changeset
4863 'font-lock-face '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
4864 (put-text-property element-common-end (1+ element-common-end)
54910
2ac3325ab7ec (completions-common-part): Rename from completion-de-emphasis.
Masatake YAMATO <jet@gyve.org>
parents: 54909
diff changeset
4865 'font-lock-face 'completions-first-difference))
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
4866 (setq element-start (next-single-property-change
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
4867 element-start
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
4868 'mouse-face))
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
4869 (if element-start
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
4870 (setq element-common-end (+ element-start common-string-length))))))
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
4871 ;; Insert help string.
6160
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
4872 (goto-char (point-min))
28113
bfff8ed76f1c (completion-setup-function): Use display-color-p.
Dave Love <fx@gnu.org>
parents: 27836
diff changeset
4873 (if (display-mouse-p)
6160
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
4874 (insert (substitute-command-keys
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4875 "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
4876 (insert (substitute-command-keys
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
4877 "In this buffer, type \\[choose-completion] to \
23450
085606778286 (completion-fixup-function): Variable deleted.
Richard M. Stallman <rms@gnu.org>
parents: 23447
diff changeset
4878 select the completion near point.\n\n")))))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4879
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
4880 (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
4881
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
4882 (define-key minibuffer-local-completion-map [prior]
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
4883 '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
4884 (define-key minibuffer-local-must-match-map [prior]
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
4885 '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
4886 (define-key minibuffer-local-completion-map "\M-v"
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
4887 '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
4888 (define-key minibuffer-local-must-match-map "\M-v"
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
4889 '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
4890
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
4891 (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
4892 "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
4893 (interactive)
12483
ec77cb3940f1 (switch-to-completions): Make a completions window if none.
Richard M. Stallman <rms@gnu.org>
parents: 12428
diff changeset
4894 ;; 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
4895 (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
4896 (minibuffer-completion-help))
20663
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
4897 (let ((window (get-buffer-window "*Completions*")))
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
4898 (when window
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
4899 (select-window window)
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
4900 (goto-char (point-min))
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
4901 (search-forward "\n\n")
2483aa76b98d (switch-to-completions): If no completions window,
Karl Heuer <kwzh@gnu.org>
parents: 20510
diff changeset
4902 (forward-line 1))))
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
4903
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4904 ;; Support keyboard commands to turn on various modifiers.
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4905
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4906 ;; 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
4907 ;; to the following event.
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4908
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4909 (defun event-apply-alt-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
4910 "\\<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
4911 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
4912 (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
4913 (defun event-apply-super-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
4914 "\\<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
4915 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
4916 (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
4917 (defun event-apply-hyper-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
4918 "\\<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
4919 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
4920 (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
4921 (defun event-apply-shift-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
4922 "\\<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
4923 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
4924 (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
4925 (defun event-apply-control-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
4926 "\\<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
4927 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
4928 (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
4929 (defun event-apply-meta-modifier (ignore-prompt)
50972
f9aa8c8600ff (back-to-indentation): Simplify.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50870
diff changeset
4930 "\\<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
4931 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
4932 (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
4933
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4934 (defun event-apply-modifier (event symbol lshiftby prefix)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4935 "Apply a modifier flag to event EVENT.
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4936 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
4937 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
4938 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
4939 (if (numberp event)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4940 (cond ((eq symbol 'control)
11201
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
4941 (if (and (<= (downcase event) ?z)
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
4942 (>= (downcase event) ?a))
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4943 (- (downcase event) ?a -1)
11201
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
4944 (if (and (<= (downcase event) ?Z)
f6caea9275af (event-apply-modifier): Fix off-by-one errors.
Karl Heuer <kwzh@gnu.org>
parents: 11159
diff changeset
4945 (>= (downcase event) ?A))
11140
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4946 (- (downcase event) ?A -1)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4947 (logior (lsh 1 lshiftby) event))))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4948 ((eq symbol 'shift)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4949 (if (and (<= (downcase event) ?z)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4950 (>= (downcase event) ?a))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4951 (upcase event)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4952 (logior (lsh 1 lshiftby) event)))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4953 (t
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4954 (logior (lsh 1 lshiftby) event)))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4955 (if (memq symbol (event-modifiers event))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4956 event
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4957 (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
4958 (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
4959 (if (symbolp event)
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4960 event-type
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4961 (cons event-type (cdr event)))))))
97ed670a6123 (event-apply-modifier): New function.
Richard M. Stallman <rms@gnu.org>
parents: 11072
diff changeset
4962
11206
60b7ab7d4fec Change bindings of event-apply-control-modifier,
Karl Heuer <kwzh@gnu.org>
parents: 11201
diff changeset
4963 (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
4964 (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
4965 (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
4966 (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
4967 (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
4968 (define-key function-key-map [?\C-x ?@ ?c] 'event-apply-control-modifier)
33786
9f63b158eb6b * simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents: 33781
diff changeset
4969
3947
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4970 ;;;; Keypad support.
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4971
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4972 ;;; 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
4973 ;;; 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
4974 ;;; 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
4975 ;;; bindings.
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4976
5342
f38861038093 (setting up kp-... keys): Make ascii-character props.
Richard M. Stallman <rms@gnu.org>
parents: 5324
diff changeset
4977 ;; 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
4978 (mapc
3947
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4979 (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
4980 (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
4981 (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
4982 (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
4983 (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
4984 '((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
4985 (kp-5 ?5) (kp-6 ?6) (kp-7 ?7) (kp-8 ?8) (kp-9 ?9)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4986 (kp-space ?\ )
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4987 (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
4988 (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
4989 (kp-multiply ?*)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4990 (kp-add ?+)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4991 (kp-separator ?,)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4992 (kp-subtract ?-)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4993 (kp-decimal ?.)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4994 (kp-divide ?/)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
4995 (kp-equal ?=)))
44906
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
4996
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
4997 ;;;;
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
4998 ;;;; forking a twin copy of a buffer.
26457
285ab8ddc125 * simple.el (backward-delete-char-untabify):
Sam Steingold <sds@gnu.org>
parents: 26356
diff changeset
4999 ;;;;
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5000
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5001 (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
5002 "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
5003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5004 (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
5005 "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
5006 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
5007 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
5008 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
5009 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
5010 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
5011 (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
5012 (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
5013 (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
5014 (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
5015 (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
5016 (new-process
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5017 (if (memq (process-status process) '(open))
43969
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
5018 (let ((args (process-contact process t)))
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
5019 (setq args (plist-put args :name newname))
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
5020 (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
5021 (if (process-buffer process)
b03a9c537356 (clone-process): Copy process' plist to new process.
Kim F. Storm <storm@cua.dk>
parents: 49103
diff changeset
5022 (current-buffer))))
43969
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
5023 (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
5024 (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
5025 (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
5026 (process-command process)))))
43969
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
5027 (set-process-query-on-exit-flag
927028937c0b Update copyright.
Kim F. Storm <storm@cua.dk>
parents: 43794
diff changeset
5028 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
5029 (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
5030 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
5031 (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
5032 (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
5033 (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
5034 new-process)))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5035
44152
cd705768cbe9 Fix typo.
Pavel Janík <Pavel@Janik.cz>
parents: 44070
diff changeset
5036 ;; 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
5037 ;; - syntax-table
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5038 ;; - overlays
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5039 (defun clone-buffer (&optional newname display-flag)
54418
37dfb033f901 (clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54259
diff changeset
5040 "Create and return a twin copy of the current buffer.
37dfb033f901 (clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54259
diff changeset
5041 Unlike an indirect buffer, the new buffer can be edited
37dfb033f901 (clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54259
diff changeset
5042 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
5043 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
5044 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
5045 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
5046 current buffer, with the proper suffix. If DISPLAY-FLAG is
37dfb033f901 (clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54259
diff changeset
5047 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
5048 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
5049 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
5050
37dfb033f901 (clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54259
diff changeset
5051 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
5052 current buffer with appropriate suffix. However, if a prefix
37dfb033f901 (clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54259
diff changeset
5053 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
5054 minibuffer.
37dfb033f901 (clone-buffer): Doc fix.
Luc Teirlinck <teirllm@auburn.edu>
parents: 54259
diff changeset
5055
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5056 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
5057 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
5058 (interactive
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
5059 (progn
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
5060 (if buffer-file-name
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
5061 (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
5062 (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
5063 (error "Cannot clone a buffer in %s mode" mode-name))
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
5064 (list (if current-prefix-arg (read-string "Name: "))
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
5065 t)))
26003
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5066 (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
5067 (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
5068 (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
5069 (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
5070 (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
5071 (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
5072 (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
5073 (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
5074 (ptmin (point-min))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5075 (ptmax (point-max))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5076 (pt (point))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5077 (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
5078 (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
5079 (mode major-mode)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5080 (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
5081 (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
5082 (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
5083 (save-restriction
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5084 (widen)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5085 (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
5086 (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
5087 (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
5088 (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
5089 (goto-char pt)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5090 (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
5091 (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
5092
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5093 ;; 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
5094 (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
5095
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5096 ;; 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
5097 (funcall mode)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5098
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5099 ;; 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
5100 (mapcar (lambda (v)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5101 (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
5102 (if (symbolp v)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5103 (makunbound v)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5104 (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
5105 (error nil)))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5106 lvars)
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5107
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5108 ;; 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
5109 ;; 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
5110 (run-hooks 'clone-buffer-hook))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5111 (if display-flag (pop-to-buffer new))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5112 new))
f6c190ef2f45 (shell-command, shell-command-on-region): use make-temp-file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 25702
diff changeset
5113
28624
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
5114
28659
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
5115 (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
5116 "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
5117
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
5118 Give the indirect buffer name NEWNAME. Interactively, read NEW-NAME
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
5119 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
5120 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
5121 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
5122 or by incrementing the N in an existing suffix.
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
5123
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
5124 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
5125 This is always done when called interactively.
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
5126
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
5127 Optional last arg NORECORD non-nil means do not put this buffer at the
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
5128 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
5129 (interactive
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
5130 (progn
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
5131 (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
5132 (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
5133 (list (if current-prefix-arg
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
5134 (read-string "BName of indirect buffer: "))
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
5135 t)))
0eb891bb0d3e (clone-indirect-buffer): Error if major mode symbol
Richard M. Stallman <rms@gnu.org>
parents: 40530
diff changeset
5136 (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
5137 (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
5138 (setq newname (or newname (buffer-name)))
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
5139 (if (string-match "<[0-9]+>\\'" newname)
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
5140 (setq newname (substring newname 0 (match-beginning 0))))
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
5141 (let* ((name (generate-new-buffer-name newname))
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
5142 (buffer (make-indirect-buffer (current-buffer) name t)))
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
5143 (when display-flag
33781
67e0378863cf (comment-line-break-function): Use the new name
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33683
diff changeset
5144 (pop-to-buffer buffer norecord))
28624
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
5145 buffer))
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
5146
aef61acb21de (clone-indirect-buffer): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28491
diff changeset
5147
28659
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
5148 (defun clone-indirect-buffer-other-window (buffer &optional norecord)
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
5149 "Create an indirect buffer that is a twin copy of BUFFER.
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
5150 Select the new buffer in another window.
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
5151 Optional second arg NORECORD non-nil means do not put this buffer at
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
5152 the front of the list of recently selected ones."
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
5153 (interactive "bClone buffer in other window: ")
45064
6e3c5d67f0fe (clone-indirect-buffer-other-window): Fix a typo in `pop-up-window'.
Eli Zaretskii <eliz@gnu.org>
parents: 44981
diff changeset
5154 (let ((pop-up-windows t))
28659
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
5155 (set-buffer buffer)
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
5156 (clone-indirect-buffer nil t norecord)))
17281c5a2834 (clone-indirect-buffer-other-window): New command.
Gerd Moellmann <gerd@gnu.org>
parents: 28624
diff changeset
5157
44906
fe8ce22fc4a1 (next-buffer, prev-buffer): New commands.
Richard M. Stallman <rms@gnu.org>
parents: 44756
diff changeset
5158
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5159 ;;; Handling of Backspace and Delete keys.
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5160
60414
ce5c67075d6b (normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60409
diff changeset
5161 (defcustom normal-erase-is-backspace
ce5c67075d6b (normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60409
diff changeset
5162 (and (not noninteractive)
ce5c67075d6b (normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60409
diff changeset
5163 (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
5164 (eq window-system 'mac)
60414
ce5c67075d6b (normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60409
diff changeset
5165 (and (memq window-system '(x))
ce5c67075d6b (normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60409
diff changeset
5166 (fboundp 'x-backspace-delete-keys-p)
ce5c67075d6b (normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60409
diff changeset
5167 (x-backspace-delete-keys-p))
ce5c67075d6b (normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60409
diff changeset
5168 ;; 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
5169 ;; 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
5170 ;; 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
5171 (and (null window-system)
ce5c67075d6b (normal-erase-is-backspace): Define default value.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 60409
diff changeset
5172 (eq tty-erase-char ?\^H))))
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5173 "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
5174
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5175 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
5176 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
5177 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
5178 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
5179 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
5180
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5181 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
5182 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
5183 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
5184 `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
5185 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
5186 have both Backspace, Delete and F1 keys.
0f079e057295 (delete-key-deletes-forward): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34713
diff changeset
5187
0f079e057295 (delete-key-deletes-forward): Doc fix.
Gerd Moellmann <gerd@gnu.org>
parents: 34713
diff changeset
5188 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
5189 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
5190 :type 'boolean
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5191 :group 'editing-basics
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5192 :version "21.1"
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5193 :set (lambda (symbol value)
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5194 ;; 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
5195 ;; dumping Emacs. It doesn't really matter.
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5196 (if (fboundp 'normal-erase-is-backspace-mode)
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5197 (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
5198 (set-default symbol value))))
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5199
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5200
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5201 (defun normal-erase-is-backspace-mode (&optional arg)
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5202 "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
5203
37248
dadde28d1d99 (normal-erase-is-backspace-mode): Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents: 37194
diff changeset
5204 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
5205
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5206 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
5207 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
5208 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
5209 `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
5210 local keymap will override that.)
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5211
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5212 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
5213 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
5214 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
5215 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
5216 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
5217 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
5218 `backward-kill-word'.
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5219
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5220 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
5221 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
5222 `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
5223 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
5224
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5225 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
5226 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
5227 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
5228 have both Backspace, Delete and F1 keys.
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5229
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5230 See also `normal-erase-is-backspace'."
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5231 (interactive "P")
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5232 (setq normal-erase-is-backspace
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5233 (if arg
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5234 (> (prefix-numeric-value arg) 0)
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5235 (not normal-erase-is-backspace)))
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5236
34570
f6aeb731a068 (delete-key-deletes-forward-mode): Treat ms-dos and
Eli Zaretskii <eliz@gnu.org>
parents: 34553
diff changeset
5237 (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
5238 (memq system-type '(ms-dos windows-nt)))
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5239 (let ((bindings
36030
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
5240 `(([C-delete] [C-backspace])
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
5241 ([M-delete] [M-backspace])
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
5242 ([C-M-delete] [C-M-backspace])
35346
382fba2f10a6 (delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents: 35333
diff changeset
5243 (,esc-map
36030
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
5244 [C-delete] [C-backspace])))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
5245 (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
5246
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5247 (if normal-erase-is-backspace
35346
382fba2f10a6 (delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents: 35333
diff changeset
5248 (progn
382fba2f10a6 (delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents: 35333
diff changeset
5249 (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
5250 (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
5251 (define-key function-key-map [backspace] [?\C-?]))
382fba2f10a6 (delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents: 35333
diff changeset
5252 (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
5253 (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
5254 (define-key function-key-map [backspace] [?\C-?]))
382fba2f10a6 (delete-key-deletes-forward-mode): Bind <backspace>
Gerd Moellmann <gerd@gnu.org>
parents: 35333
diff changeset
5255
36030
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
5256 ;; 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
5257 (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
5258 (dolist (binding bindings)
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
5259 (let ((map global-map))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
5260 (when (keymapp (car binding))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
5261 (setq map (car binding) binding (cdr binding)))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
5262 (let* ((key1 (nth 0 binding))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
5263 (key2 (nth 1 binding))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
5264 (binding1 (lookup-key map key1))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
5265 (binding2 (lookup-key map key2)))
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
5266 (define-key map key1 binding2)
6ef1520f4852 (delete-key-deletes-forward-mode):
Richard M. Stallman <rms@gnu.org>
parents: 36021
diff changeset
5267 (define-key map key2 binding1)))))))
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5268 (t
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5269 (if normal-erase-is-backspace
34553
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5270 (progn
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5271 (keyboard-translate ?\C-h ?\C-?)
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5272 (keyboard-translate ?\C-? ?\C-d))
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5273 (keyboard-translate ?\C-h ?\C-h)
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5274 (keyboard-translate ?\C-? ?\C-?))))
bd89ec7640bb (delete-key-deletes-forward): New user-option.
Gerd Moellmann <gerd@gnu.org>
parents: 34462
diff changeset
5275
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5276 (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
5277 (if (interactive-p)
37194
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5278 (message "Delete key deletes %s"
299f754a4b17 (normal-erase-is-backspace): Rename from
Eli Zaretskii <eliz@gnu.org>
parents: 37092
diff changeset
5279 (if normal-erase-is-backspace "forward" "backward"))))
51220
c7730f2ad484 (idle-update-delay): New variable.
Juanma Barranquero <lekktu@gmail.com>
parents: 51219
diff changeset
5280
51606
bee14d8ec0a6 (kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51597
diff changeset
5281 (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
5282 "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
5283
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5284 (define-minor-mode visible-mode
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5285 "Toggle Visible mode.
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5286 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
5287
d8ab29cb1111 (visible-mode): Renamed from vis-mode.
Richard M. Stallman <rms@gnu.org>
parents: 51706
diff changeset
5288 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
5289 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
5290 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
5291 :lighter " Vis"
61232
728460f45e1e (visible-mode): Use explicit :group keyword. This changes the group
Luc Teirlinck <teirllm@auburn.edu>
parents: 61121
diff changeset
5292 :group 'editing-basics
51606
bee14d8ec0a6 (kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51597
diff changeset
5293 (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
5294 (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
5295 (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
5296 (when visible-mode
51606
bee14d8ec0a6 (kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51597
diff changeset
5297 (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
5298 buffer-invisibility-spec)
bee14d8ec0a6 (kill-new): Leave yank-handler property alone if no
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51597
diff changeset
5299 (setq buffer-invisibility-spec nil)))
51597
9b14210f4740 (vis-mode): New function.
Luc Teirlinck <teirllm@auburn.edu>
parents: 51461
diff changeset
5300
40530
a0dc24114eee (reindent-then-newline-and-indent): Insert the newline
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 40069
diff changeset
5301 ;; Minibuffer prompt stuff.
39271
d56dcab29cce (minibuffer-prompt-modification)
Gerd Moellmann <gerd@gnu.org>
parents: 39157
diff changeset
5302
39289
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
5303 ;(defun minibuffer-prompt-modification (start end)
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
5304 ; (error "You cannot modify the prompt"))
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
5305 ;
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
5306 ;
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
5307 ;(defun minibuffer-prompt-insertion (start end)
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
5308 ; (let ((inhibit-modification-hooks t))
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
5309 ; (delete-region start end)
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
5310 ; ;; 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
5311 ; ;; and for the text deletion.above.
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
5312 ; (when (consp buffer-undo-list)
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
5313 ; (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
5314 ; (message "You cannot modify the prompt")))
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
5315 ;
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
5316 ;
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
5317 ;(setq minibuffer-prompt-properties
39289
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
5318 ; (list 'modification-hooks '(minibuffer-prompt-modification)
c5d6010e15ee Comment out change of 2001-09-13.
Gerd Moellmann <gerd@gnu.org>
parents: 39271
diff changeset
5319 ; 'insert-in-front-hooks '(minibuffer-prompt-insertion)))
49597
e88404e8f2cf Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49585
diff changeset
5320 ;
39271
d56dcab29cce (minibuffer-prompt-modification)
Gerd Moellmann <gerd@gnu.org>
parents: 39157
diff changeset
5321
47462
1bbef0cbbf67 Provide `simple'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47408
diff changeset
5322 (provide 'simple)
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52367
diff changeset
5323
55699
030ebc46c0c1 (do-auto-fill): Remove unused vars `bol' and `opoint'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55425
diff changeset
5324 ;; arch-tag: 24af67c0-2a49-44f6-b3b1-312d8b570dfd
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
5325 ;;; simple.el ends here