annotate lisp/simple.el @ 10779:7d9423ce104d

(quoted-insert): Use insert-and-inherit. Don't change buffer if arg is negative.
author Richard M. Stallman <rms@gnu.org>
date Fri, 17 Feb 1995 23:59:43 +0000
parents 8ba6f9709cff
children 7b7874738e7c
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
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
3 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994 Free Software Foundation, Inc.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5 ;; This file is part of GNU Emacs.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 ;; GNU Emacs is free software; you can redistribute it and/or modify
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8 ;; 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
9 ;; the Free Software Foundation; either version 2, or (at your option)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 ;; any later version.
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 distributed in the hope that it will be useful,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 ;; GNU General Public License for more details.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 ;; You should have received a copy of the GNU General Public License
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 ;; along with GNU Emacs; see the file COPYING. If not, write to
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
19 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
20
2315
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
21 ;;; Commentary:
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
22
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
23 ;; 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
24 ;; major mode or to file-handling.
9e7ec92a4fdf Added or corrected Commentary headers
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2301
diff changeset
25
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
26 ;;; Code:
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
27
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
28 (defun open-line (arg)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
29 "Insert a newline and leave point before it.
1063
25b929c06f83 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1039
diff changeset
30 If there is a fill prefix, insert the fill prefix on the new line
25b929c06f83 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1039
diff changeset
31 if the line would have been empty.
25b929c06f83 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1039
diff changeset
32 With arg N, insert N newlines."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
33 (interactive "*p")
1063
25b929c06f83 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1039
diff changeset
34 (let* ((do-fill-prefix (and fill-prefix (bolp)))
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
35 (loc (point)))
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
36 (while (> arg 0)
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
37 (if do-fill-prefix (insert-and-inherit fill-prefix))
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
38 (newline 1)
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
39 (setq arg (1- arg)))
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
40 (goto-char loc))
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
41 (end-of-line))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
42
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
43 (defun split-line ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
44 "Split current line, moving portion beyond point vertically down."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
45 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
46 (skip-chars-forward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
47 (let ((col (current-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
48 (pos (point)))
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
49 (newline 1)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
50 (indent-to col 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
51 (goto-char pos)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
52
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
53 (defun quoted-insert (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
54 "Read next input character and insert it.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
55 This is useful for inserting control characters.
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1812
diff changeset
56 You may also type up to 3 octal digits, to insert a character with that code.
2215
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
57
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
58 In overwrite mode, this function inserts the character anyway, and
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
59 does not handle octal digits specially. This means that if you use
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
60 overwrite as your normal editing mode, you can use this function to
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
61 insert characters when necessary.
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
62
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
63 In binary overwrite mode, this function does overwrite, and octal
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
64 digits are interpreted as a character code. This is supposed to make
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
65 this function useful in editing binary files."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
66 (interactive "*p")
2215
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
67 (let ((char (if (or (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
68 (eq overwrite-mode '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
69 (read-quoted-char)
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
70 (read-char))))
10779
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
71 (if (> arg 0)
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
72 (if (eq overwrite-mode 'overwrite-mode-binary)
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
73 (delete-char arg)))
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
74 (while (> arg 0)
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
75 (insert-and-inherit char)
7d9423ce104d (quoted-insert): Use insert-and-inherit.
Richard M. Stallman <rms@gnu.org>
parents: 10722
diff changeset
76 (setq arg (1- arg)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
77
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
78 (defun delete-indentation (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
79 "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
80 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
81 With argument, join this line to following line."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
82 (interactive "*P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
83 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
84 (if arg (forward-line 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
85 (if (eq (preceding-char) ?\n)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
86 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
87 (delete-region (point) (1- (point)))
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
88 ;; If the second line started with the fill prefix,
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
89 ;; delete the prefix.
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
90 (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
91 (<= (+ (point) (length fill-prefix)) (point-max))
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
92 (string= fill-prefix
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
93 (buffer-substring (point)
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
94 (+ (point) (length fill-prefix)))))
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
95 (delete-region (point) (+ (point) (length fill-prefix))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
96 (fixup-whitespace))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
97
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
98 (defun fixup-whitespace ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
99 "Fixup white space between objects around point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
100 Leave one space or none, according to the context."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
101 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
102 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
103 (delete-horizontal-space)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
104 (if (or (looking-at "^\\|\\s)")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
105 (save-excursion (forward-char -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
106 (looking-at "$\\|\\s(\\|\\s'")))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
107 nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
108 (insert ?\ ))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
109
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
110 (defun delete-horizontal-space ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
111 "Delete all spaces and tabs around point."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
112 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
113 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
114 (delete-region (point) (progn (skip-chars-forward " \t") (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
115
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
116 (defun just-one-space ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
117 "Delete all spaces and tabs around point, leaving one space."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
118 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
119 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
120 (if (= (following-char) ? )
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
121 (forward-char 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
122 (insert ? ))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
123 (delete-region (point) (progn (skip-chars-forward " \t") (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
124
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
125 (defun delete-blank-lines ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
126 "On blank line, delete all surrounding blank lines, leaving just one.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
127 On isolated blank line, delete that one.
7817
d729f75fff04 (delete-blank-lines): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 7762
diff changeset
128 On nonblank line, delete any immediately following blank lines."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
129 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
130 (let (thisblank singleblank)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
131 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
132 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
133 (setq thisblank (looking-at "[ \t]*$"))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
134 ;; Set singleblank if there is just one blank line here.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
135 (setq singleblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
136 (and thisblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
137 (not (looking-at "[ \t]*\n[ \t]*$"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
138 (or (bobp)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
139 (progn (forward-line -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
140 (not (looking-at "[ \t]*$")))))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
141 ;; 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
142 (if thisblank
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
143 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
144 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
145 (if singleblank (forward-line 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
146 (delete-region (point)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
147 (if (re-search-backward "[^ \t\n]" nil t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
148 (progn (forward-line 1) (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
149 (point-min)))))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
150 ;; Delete following blank lines, unless the current line is blank
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
151 ;; and there are no following blank lines.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
152 (if (not (and thisblank singleblank))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
153 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
154 (end-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
155 (forward-line 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
156 (delete-region (point)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
157 (if (re-search-forward "[^ \t\n]" nil t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
158 (progn (beginning-of-line) (point))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
159 (point-max)))))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
160 ;; 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
161 ;; Delete the line, leaving point at eob.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
162 (if (looking-at "^[ \t]*\n\\'")
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
163 (delete-region (point) (point-max)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
164
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
165 (defun back-to-indentation ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
166 "Move point to the first non-whitespace character on this line."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
167 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
168 (beginning-of-line 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
169 (skip-chars-forward " \t"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
170
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
171 (defun newline-and-indent ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
172 "Insert a newline, then indent according to major mode.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
173 Indentation is done using the value of `indent-line-function'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
174 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
175 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
176 column specified by the function `current-left-margin'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
177 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
178 (delete-region (point) (progn (skip-chars-backward " \t") (point)))
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
179 (newline)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
180 (indent-according-to-mode))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
181
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
182 (defun reindent-then-newline-and-indent ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
183 "Reindent current line, insert newline, then indent the new line.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
184 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
185 which means calling the current value of `indent-line-function'.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
186 In programming language modes, this is the same as TAB.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
187 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
188 column specified by the function `current-left-margin'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
189 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
190 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
191 (delete-region (point) (progn (skip-chars-backward " \t") (point)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
192 (indent-according-to-mode))
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
193 (newline)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
194 (indent-according-to-mode))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
195
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
196 ;; Internal subroutine of delete-char
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
197 (defun kill-forward-chars (arg)
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
198 (if (listp arg) (setq arg (car arg)))
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
199 (if (eq arg '-) (setq arg -1))
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
200 (kill-region (point) (+ (point) arg)))
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
201
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
202 ;; Internal subroutine of backward-delete-char
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
203 (defun kill-backward-chars (arg)
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
204 (if (listp arg) (setq arg (car arg)))
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
205 (if (eq arg '-) (setq arg -1))
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
206 (kill-region (point) (- (point) arg)))
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
207
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
208 (defun backward-delete-char-untabify (arg &optional killp)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
209 "Delete characters backward, changing tabs into spaces.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
210 Delete ARG chars, and kill (save in kill ring) if KILLP is non-nil.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
211 Interactively, ARG is the prefix arg (default 1)
8600
0c56de09028d (backward-delete-char-untabify): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8559
diff changeset
212 and KILLP is t if a prefix arg was specified."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
213 (interactive "*p\nP")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
214 (let ((count arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
215 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
216 (while (and (> count 0) (not (bobp)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
217 (if (= (preceding-char) ?\t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
218 (let ((col (current-column)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
219 (forward-char -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
220 (setq col (- col (current-column)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
221 (insert-char ?\ col)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
222 (delete-char 1)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
223 (forward-char -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
224 (setq count (1- count)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
225 (delete-backward-char arg killp)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
226 ;; In overwrite mode, back over columns while clearing them out,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
227 ;; unless at end of line.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
228 (and overwrite-mode (not (eolp))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
229 (save-excursion (insert-char ?\ arg))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
230
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
231 (defun zap-to-char (arg char)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
232 "Kill up to and including ARG'th occurrence of CHAR.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
233 Goes backward if ARG is negative; error if CHAR not found."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
234 (interactive "p\ncZap to char: ")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
235 (kill-region (point) (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
236 (search-forward (char-to-string char) nil nil arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
237 ; (goto-char (if (> arg 0) (1- (point)) (1+ (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
238 (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
239
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
240 (defun beginning-of-buffer (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
241 "Move point to the beginning of the buffer; leave mark at previous position.
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
242 With arg N, put point N/10 of the way from the beginning.
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
243
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
244 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
245 of the accessible part of the buffer.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
246
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
247 Don't use this command in Lisp programs!
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
248 \(goto-char (point-min)) is faster and avoids clobbering the mark."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
249 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
250 (push-mark)
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
251 (let ((size (- (point-max) (point-min))))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
252 (goto-char (if arg
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
253 (+ (point-min)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
254 (if (> size 10000)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
255 ;; Avoid overflow for large buffer sizes!
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
256 (* (prefix-numeric-value arg)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
257 (/ size 10))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
258 (/ (+ 10 (* size (prefix-numeric-value arg))) 10)))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
259 (point-min))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
260 (if arg (forward-line 1)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
261
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
262 (defun end-of-buffer (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
263 "Move point to the end of the buffer; leave mark at previous position.
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
264 With arg N, put point N/10 of the way from the end.
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
265
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
266 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
267 of the accessible part of the buffer.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
268
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
269 Don't use this command in Lisp programs!
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
270 \(goto-char (point-max)) is faster and avoids clobbering the mark."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
271 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
272 (push-mark)
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
273 (let ((size (- (point-max) (point-min))))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
274 (goto-char (if arg
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
275 (- (point-max)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
276 (if (> size 10000)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
277 ;; Avoid overflow for large buffer sizes!
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
278 (* (prefix-numeric-value arg)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
279 (/ size 10))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
280 (/ (* size (prefix-numeric-value arg)) 10)))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
281 (point-max))))
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
282 ;; 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
283 ;; adjust it to the beginning of a line.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
284 (if arg (forward-line 1)
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
285 ;; If the end of the buffer is not already on the screen,
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
286 ;; then scroll specially to put it near, but not at, the bottom.
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
287 (if (let ((old-point (point)))
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
288 (save-excursion
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
289 (goto-char (window-start))
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
290 (vertical-motion (window-height))
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
291 (< (point) old-point)))
7877
0eb805c768af (end-of-buffer): Recenter overlay lists.
Richard M. Stallman <rms@gnu.org>
parents: 7817
diff changeset
292 (progn
0eb805c768af (end-of-buffer): Recenter overlay lists.
Richard M. Stallman <rms@gnu.org>
parents: 7817
diff changeset
293 (overlay-recenter (point))
0eb805c768af (end-of-buffer): Recenter overlay lists.
Richard M. Stallman <rms@gnu.org>
parents: 7817
diff changeset
294 (recenter -3)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
295
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
296 (defun mark-whole-buffer ()
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
297 "Put point at beginning and mark at end of buffer.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
298 You probably should not use this function in Lisp programs;
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
299 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
300 that uses or sets the mark."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
301 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
302 (push-mark (point))
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
303 (push-mark (point-max) nil t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
304 (goto-char (point-min)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
305
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
306 (defun count-lines-region (start end)
3591
507f64624555 Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents: 3487
diff changeset
307 "Print number of lines and characters in the region."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
308 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
309 (message "Region has %d lines, %d characters"
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
310 (count-lines start end) (- end start)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
311
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
312 (defun what-line ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
313 "Print the current line number (in the buffer) of point."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
314 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
315 (save-restriction
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
316 (widen)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
317 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
318 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
319 (message "Line %d"
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
320 (1+ (count-lines 1 (point)))))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
321
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
322 (defun count-lines (start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
323 "Return number of lines between START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
324 This is usually the number of newlines between them,
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
325 but can be one more if START is not equal to END
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
326 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
327 (save-excursion
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
328 (save-restriction
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
329 (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
330 (goto-char (point-min))
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
331 (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
332 (save-match-data
2421
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
333 (let ((done 0))
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
334 (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
335 (setq done (+ 40 done)))
eb9815e0a71d (count-lines): Use save-match-data.
Richard M. Stallman <rms@gnu.org>
parents: 2416
diff changeset
336 (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
337 (setq done (+ 1 done)))
5151
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
338 (goto-char (point-max))
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
339 (if (and (/= start end)
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
340 (not (bolp)))
8b31cff02267 (count-lines): In selective-display case,
Richard M. Stallman <rms@gnu.org>
parents: 5135
diff changeset
341 (1+ done)
9554
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
342 done)))
d3f3f3db986d (count-lines): Do save-match-data only when necessary.
Richard M. Stallman <rms@gnu.org>
parents: 9539
diff changeset
343 (- (buffer-size) (forward-line (buffer-size)))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
344
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
345 (defun what-cursor-position ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
346 "Print info on cursor position (on screen and within buffer)."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
347 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
348 (let* ((char (following-char))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
349 (beg (point-min))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
350 (end (point-max))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
351 (pos (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
352 (total (buffer-size))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
353 (percent (if (> total 50000)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
354 ;; Avoid overflow from multiplying by 100!
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
355 (/ (+ (/ total 200) (1- pos)) (max (/ total 100) 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
356 (/ (+ (/ total 2) (* 100 (1- pos))) (max total 1))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
357 (hscroll (if (= (window-hscroll) 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
358 ""
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
359 (format " Hscroll=%d" (window-hscroll))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
360 (col (current-column)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
361 (if (= pos end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
362 (if (or (/= beg 1) (/= end (1+ total)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
363 (message "point=%d of %d(%d%%) <%d - %d> column %d %s"
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
364 pos total percent beg end col hscroll)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
365 (message "point=%d of %d(%d%%) column %d %s"
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
366 pos total percent col hscroll))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
367 (if (or (/= beg 1) (/= end (1+ total)))
10352
cc26982277e4 (what-cursor-position): Show char in decimal, hex, octal.
Richard M. Stallman <rms@gnu.org>
parents: 10351
diff changeset
368 (message "Char: %s (0%o, %d, 0x%x) point=%d of %d(%d%%) <%d - %d> column %d %s"
cc26982277e4 (what-cursor-position): Show char in decimal, hex, octal.
Richard M. Stallman <rms@gnu.org>
parents: 10351
diff changeset
369 (single-key-description char) char char char pos total percent beg end col hscroll)
cc26982277e4 (what-cursor-position): Show char in decimal, hex, octal.
Richard M. Stallman <rms@gnu.org>
parents: 10351
diff changeset
370 (message "Char: %s (0%o, %d, 0x%x) point=%d of %d(%d%%) column %d %s"
cc26982277e4 (what-cursor-position): Show char in decimal, hex, octal.
Richard M. Stallman <rms@gnu.org>
parents: 10351
diff changeset
371 (single-key-description char) char char char pos total percent col hscroll)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
372
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
373 (defun fundamental-mode ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
374 "Major mode not specialized for anything in particular.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
375 Other major modes are defined by comparison with this one."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
376 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
377 (kill-all-local-variables))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
378
4894
1574c6c6561f (eval-expression): Fix typo: missing paren.
Roland McGrath <roland@gnu.org>
parents: 4886
diff changeset
379 (defvar read-expression-map (cons 'keymap minibuffer-local-map)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
380 "Minibuffer keymap used for reading Lisp expressions.")
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
381 (define-key read-expression-map "\M-\t" 'lisp-complete-symbol)
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
382
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
383 (put 'eval-expression 'disabled t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
384
4289
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
385 (defvar read-expression-history nil)
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
386
4d0c57f01eed (read-expression-history): New defvar.
Roland McGrath <roland@gnu.org>
parents: 4287
diff changeset
387 ;; We define this, rather than making `eval' interactive,
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
388 ;; for the sake of completion of names like eval-region, eval-current-buffer.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
389 (defun eval-expression (expression)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
390 "Evaluate EXPRESSION and print value in minibuffer.
954
9e51bb887797 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 921
diff changeset
391 Value is also consed on to front of the variable `values'."
4886
20e345c97e28 (eval-expression, edit-and-eval-command): Let
Brian Fox <bfox@gnu.org>
parents: 4869
diff changeset
392 (interactive
5068
9a42f23df119 (eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents: 4894
diff changeset
393 (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
394 nil read-expression-map t
9a42f23df119 (eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents: 4894
diff changeset
395 'read-expression-history)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
396 (setq values (cons (eval expression) values))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
397 (prin1 (car values) t))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
398
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
399 (defun edit-and-eval-command (prompt command)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
400 "Prompting with PROMPT, let user edit COMMAND and eval result.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
401 COMMAND is a Lisp expression. Let user edit that expression in
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
402 the minibuffer, then read and evaluate the result."
5068
9a42f23df119 (eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents: 4894
diff changeset
403 (let ((command (read-from-minibuffer prompt
9a42f23df119 (eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents: 4894
diff changeset
404 (prin1-to-string command)
9a42f23df119 (eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents: 4894
diff changeset
405 read-expression-map t
9a42f23df119 (eval-expression): Don't bind minibuffer-history-sexp-flag.
Richard M. Stallman <rms@gnu.org>
parents: 4894
diff changeset
406 '(command-history . 1))))
9629
53e092e189c6 (edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents: 9554
diff changeset
407 ;; If command was added to command-history as a string,
53e092e189c6 (edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents: 9554
diff changeset
408 ;; get rid of that. We want only evallable expressions there.
53e092e189c6 (edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents: 9554
diff changeset
409 (if (stringp (car command-history))
53e092e189c6 (edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents: 9554
diff changeset
410 (setq command-history (cdr command-history)))
53e092e189c6 (edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents: 9554
diff changeset
411
53e092e189c6 (edit-and-eval-command): Elements of command-history are forms, not strings.
Karl Heuer <kwzh@gnu.org>
parents: 9554
diff changeset
412 ;; 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
413 ;; 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
414 (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
415 (setq command-history (cons command command-history)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
416 (eval command)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
417
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
418 (defun repeat-complex-command (arg)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
419 "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
420 A complex command is one which used the minibuffer.
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
421 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
422 The result is executed, repeating the command as changed.
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
423 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
424 it is added to the front of the command history.
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
425 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
426 to get different commands to edit and resubmit."
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
427 (interactive "p")
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
428 (let ((elt (nth (1- arg) command-history))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
429 (minibuffer-history-position arg)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
430 (minibuffer-history-sexp-flag t)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
431 newcmd)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
432 (if elt
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
433 (progn
4821
2c16f99ef5dc (edit-and-eval-command): Let `read-from-minibuffer' manipulate the
Brian Fox <bfox@gnu.org>
parents: 4765
diff changeset
434 (setq newcmd
8734
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
435 (let ((print-level nil))
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
436 (read-from-minibuffer
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
437 "Redo: " (prin1-to-string elt) read-expression-map t
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
438 (cons 'command-history arg))))
4821
2c16f99ef5dc (edit-and-eval-command): Let `read-from-minibuffer' manipulate the
Brian Fox <bfox@gnu.org>
parents: 4765
diff changeset
439
5135
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
440 ;; If command was added to command-history as a string,
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
441 ;; get rid of that. We want only evallable expressions there.
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
442 (if (stringp (car command-history))
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
443 (setq command-history (cdr command-history)))
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
444
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
445 ;; 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
446 ;; add it to the history.
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
447 (or (equal newcmd (car command-history))
b8731641d26a (repeat-complex-command): Undo Oct 2 change.
Richard M. Stallman <rms@gnu.org>
parents: 5068
diff changeset
448 (setq command-history (cons newcmd command-history)))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
449 (eval newcmd))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
450 (ding))))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
451
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
452 (defvar minibuffer-history nil
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
453 "Default minibuffer history list.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
454 This is used for all minibuffer input
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
455 except when an alternate history list is specified.")
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
456 (defvar minibuffer-history-sexp-flag nil
7373
451602bf12e4 (minibuffer-history-sexp-flag): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 7333
diff changeset
457 "Non-nil when doing history operations on `command-history'.
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
458 More generally, indicates that the history list being acted on
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
459 contains expressions rather than strings.")
862
46630543d659 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 859
diff changeset
460 (setq minibuffer-history-variable 'minibuffer-history)
46630543d659 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 859
diff changeset
461 (setq minibuffer-history-position nil)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
462 (defvar minibuffer-history-search-history nil)
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
463
921
c5c4c2ee8f26 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 892
diff changeset
464 (mapcar
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
465 (lambda (key-and-command)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
466 (mapcar
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
467 (lambda (keymap-and-completionp)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
468 ;; Arg is (KEYMAP-SYMBOL . COMPLETION-MAP-P).
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
469 ;; If the cdr of KEY-AND-COMMAND (the command) is a cons,
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
470 ;; its car is used if COMPLETION-MAP-P is nil, its cdr if it is t.
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
471 (define-key (symbol-value (car keymap-and-completionp))
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
472 (car key-and-command)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
473 (let ((command (cdr key-and-command)))
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
474 (if (consp command)
1826
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
475 ;; (and ... nil) => ... turns back on the completion-oriented
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
476 ;; history commands which rms turned off since they seem to
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
477 ;; do things he doesn't like.
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
478 (if (and (cdr keymap-and-completionp) nil) ;XXX turned off
1838
34da3c151be4 Restore nuked information in minibuffer history bindings.
Roland McGrath <roland@gnu.org>
parents: 1837
diff changeset
479 (progn (error "EMACS BUG!") (cdr command))
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
480 (car command))
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
481 command))))
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
482 '((minibuffer-local-map . nil)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
483 (minibuffer-local-ns-map . nil)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
484 (minibuffer-local-completion-map . t)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
485 (minibuffer-local-must-match-map . t)
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
486 (read-expression-map . nil))))
1838
34da3c151be4 Restore nuked information in minibuffer history bindings.
Roland McGrath <roland@gnu.org>
parents: 1837
diff changeset
487 '(("\en" . (next-history-element . next-complete-history-element))
34da3c151be4 Restore nuked information in minibuffer history bindings.
Roland McGrath <roland@gnu.org>
parents: 1837
diff changeset
488 ([next] . (next-history-element . next-complete-history-element))
34da3c151be4 Restore nuked information in minibuffer history bindings.
Roland McGrath <roland@gnu.org>
parents: 1837
diff changeset
489 ("\ep" . (previous-history-element . previous-complete-history-element))
34da3c151be4 Restore nuked information in minibuffer history bindings.
Roland McGrath <roland@gnu.org>
parents: 1837
diff changeset
490 ([prior] . (previous-history-element . previous-complete-history-element))
921
c5c4c2ee8f26 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 892
diff changeset
491 ("\er" . previous-matching-history-element)
c5c4c2ee8f26 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 892
diff changeset
492 ("\es" . next-matching-history-element)))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
493
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
494 (defun previous-matching-history-element (regexp n)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
495 "Find the previous history element that matches REGEXP.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
496 \(Previous history elements refer to earlier actions.)
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
497 With prefix argument N, search for Nth previous match.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
498 If N is negative, find the next or Nth next match."
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
499 (interactive
2681
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
500 (let* ((enable-recursive-minibuffers t)
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
501 (minibuffer-history-sexp-flag nil)
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
502 (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
503 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
504 minibuffer-local-map
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
505 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
506 'minibuffer-history-search-history)))
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
507 ;; 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
508 (list (if (string= regexp "")
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
509 (setcar minibuffer-history-search-history
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
510 (nth 1 minibuffer-history-search-history))
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
511 regexp)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
512 (prefix-numeric-value current-prefix-arg))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
513 (let ((history (symbol-value minibuffer-history-variable))
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
514 prevpos
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
515 (pos minibuffer-history-position))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
516 (while (/= n 0)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
517 (setq prevpos pos)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
518 (setq pos (min (max 1 (+ pos (if (< n 0) -1 1))) (length history)))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
519 (if (= pos prevpos)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
520 (error (if (= pos 1)
892
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
521 "No later matching history item"
3a9943a4a440 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 874
diff changeset
522 "No earlier matching history item")))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
523 (if (string-match regexp
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
524 (if minibuffer-history-sexp-flag
8734
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
525 (let ((print-level nil))
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
526 (prin1-to-string (nth (1- pos) history)))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
527 (nth (1- pos) history)))
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
528 (setq n (+ n (if (< n 0) 1 -1)))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
529 (setq minibuffer-history-position pos)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
530 (erase-buffer)
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
531 (let ((elt (nth (1- pos) history)))
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
532 (insert (if minibuffer-history-sexp-flag
8734
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
533 (let ((print-level nil))
bd55f44d82f1 (repeat-complex-command, next-history-element,
Richard M. Stallman <rms@gnu.org>
parents: 8695
diff changeset
534 (prin1-to-string elt))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
535 elt)))
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
536 (goto-char (point-min)))
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
537 (if (or (eq (car (car command-history)) 'previous-matching-history-element)
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
538 (eq (car (car command-history)) 'next-matching-history-element))
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
539 (setq command-history (cdr command-history))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
540
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
541 (defun next-matching-history-element (regexp n)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
542 "Find the next history element that matches REGEXP.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
543 \(The next history element refers to a more recent action.)
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
544 With prefix argument N, search for Nth next match.
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
545 If N is negative, find the previous or Nth previous match."
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
546 (interactive
2681
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
547 (let* ((enable-recursive-minibuffers t)
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
548 (minibuffer-history-sexp-flag nil)
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
549 (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
550 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
551 minibuffer-local-map
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
552 nil
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
553 'minibuffer-history-search-history)))
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
554 ;; 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
555 (list (if (string= regexp "")
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
556 (setcar minibuffer-history-search-history
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
557 (nth 1 minibuffer-history-search-history))
9ebd08f578f0 (previous-matching-history-element): If minibuf is empty,
Richard M. Stallman <rms@gnu.org>
parents: 2669
diff changeset
558 regexp)
1135
e33f6475229a *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 1063
diff changeset
559 (prefix-numeric-value current-prefix-arg))))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
560 (previous-matching-history-element regexp (- n)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
561
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
562 (defun next-history-element (n)
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
563 "Insert the next element of the minibuffer history into the minibuffer."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
564 (interactive "p")
10722
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
565 (or (zerop n)
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
566 (let ((narg (min (max 1 (- minibuffer-history-position n))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
567 (length (symbol-value minibuffer-history-variable)))))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
568 (if (or (zerop narg)
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
569 (= minibuffer-history-position narg))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
570 (error (if (if (zerop narg)
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
571 (> n 0)
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
572 (= minibuffer-history-position 1))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
573 "End of history; no next item"
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
574 "Beginning of history; no preceding item"))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
575 (erase-buffer)
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
576 (setq minibuffer-history-position narg)
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
577 (let ((elt (nth (1- minibuffer-history-position)
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
578 (symbol-value minibuffer-history-variable))))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
579 (insert
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
580 (if minibuffer-history-sexp-flag
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
581 (let ((print-level nil))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
582 (prin1-to-string elt))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
583 elt)))
8ba6f9709cff (next-history-element): Do nothing if n is 0.
Richard M. Stallman <rms@gnu.org>
parents: 10597
diff changeset
584 (goto-char (point-min))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
585
858
b11800dc877d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
586 (defun previous-history-element (n)
1145
e6cefcaba564 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 1135
diff changeset
587 "Inserts the previous element of the minibuffer history into the minibuffer."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
588 (interactive "p")
859
5f325fbc093d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 858
diff changeset
589 (next-history-element (- n)))
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
590
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
591 (defun next-complete-history-element (n)
5324
f091cdec77e2 (next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5151
diff changeset
592 "Get next element of history which is a completion of minibuffer contents."
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
593 (interactive "p")
1826
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
594 (let ((point-at-start (point)))
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
595 (next-matching-history-element
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
596 (concat "^" (regexp-quote (buffer-substring (point-min) (point)))) n)
6ca05c5f8979 (next-complete-history-element): Restore point after replacing the
Roland McGrath <roland@gnu.org>
parents: 1824
diff changeset
597 ;; 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
598 ;; 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
599 ;; 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
600 (goto-char point-at-start)))
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
601
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
602 (defun previous-complete-history-element (n)
5324
f091cdec77e2 (next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5151
diff changeset
603 "\
f091cdec77e2 (next-complete-history-element): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5151
diff changeset
604 Get previous element of history which is a completion of minibuffer contents."
1811
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
605 (interactive "p")
3e4f8b1da4e9 ({next,previous}-complete-history-element): New functions.
Roland McGrath <roland@gnu.org>
parents: 1771
diff changeset
606 (next-complete-history-element (- n)))
874
b945f592b94d *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 870
diff changeset
607
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
608 (defun goto-line (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
609 "Goto line ARG, counting from line 1 at beginning of buffer."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
610 (interactive "NGoto line: ")
9343
ee9866892683 (goto-line): Call prefix-numeric-value.
Richard M. Stallman <rms@gnu.org>
parents: 9065
diff changeset
611 (setq arg (prefix-numeric-value arg))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
612 (save-restriction
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
613 (widen)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
614 (goto-char 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
615 (if (eq selective-display t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
616 (re-search-forward "[\n\C-m]" nil 'end (1- arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
617 (forward-line (1- arg)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
618
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
619 ;Put this on C-x u, so we can force that rather than C-_ into startup msg
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
620 (define-function 'advertised-undo 'undo)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
621
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
622 (defun undo (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
623 "Undo some previous changes.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
624 Repeat this command to undo more changes.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
625 A numeric argument serves as a repeat count."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
626 (interactive "*p")
5935
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
627 ;; 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
628 ;; for the following command.
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
629 (setq this-command t)
3408
8ffb00332c5f (undo): Pass proper arg to delete-auto-save-file-if-necessary.
Richard M. Stallman <rms@gnu.org>
parents: 3034
diff changeset
630 (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
631 (recent-save (recent-auto-save-p)))
582
a9c4bc19b2aa *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 513
diff changeset
632 (or (eq (selected-window) (minibuffer-window))
a9c4bc19b2aa *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 513
diff changeset
633 (message "Undo!"))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
634 (or (eq last-command 'undo)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
635 (progn (undo-start)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
636 (undo-more 1)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
637 (undo-more (or arg 1))
6386
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
638 ;; 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
639 ;; 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
640 (let ((tail buffer-undo-list)
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
641 done)
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
642 (while (and tail (not done) (not (null (car tail))))
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
643 (if (integerp (car tail))
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
644 (progn
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
645 (setq done t)
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
646 (setq buffer-undo-list (delq (car tail) buffer-undo-list))))
1eabdff45c61 (undo): Don't let the undo entries for the undo
Richard M. Stallman <rms@gnu.org>
parents: 6237
diff changeset
647 (setq tail (cdr tail))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
648 (and modified (not (buffer-modified-p))
5935
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
649 (delete-auto-save-file-if-necessary recent-save)))
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
650 ;; If we do get all the way thru, make this-command indicate that.
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
651 (setq this-command 'undo))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
652
2947
518509536741 (pending-undo-list): Var declared.
Richard M. Stallman <rms@gnu.org>
parents: 2935
diff changeset
653 (defvar pending-undo-list nil
518509536741 (pending-undo-list): Var declared.
Richard M. Stallman <rms@gnu.org>
parents: 2935
diff changeset
654 "Within a run of consecutive undo commands, list remaining to be undone.")
518509536741 (pending-undo-list): Var declared.
Richard M. Stallman <rms@gnu.org>
parents: 2935
diff changeset
655
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
656 (defun undo-start ()
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
657 "Set `pending-undo-list' to the front of the undo list.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
658 The next call to `undo-more' will undo the most recently made change."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
659 (if (eq buffer-undo-list t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
660 (error "No undo information in this buffer"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
661 (setq pending-undo-list buffer-undo-list))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
662
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
663 (defun undo-more (count)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
664 "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
665 Call `undo-start' to get ready to undo recent changes,
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
666 then call `undo-more' one or more times to undo them."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
667 (or pending-undo-list
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
668 (error "No further undo information"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
669 (setq pending-undo-list (primitive-undo count pending-undo-list)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
670
4374
1a64d641cea4 (shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4289
diff changeset
671 (defvar shell-command-history nil
1a64d641cea4 (shell-command-history): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 4289
diff changeset
672 "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
673
9779
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
674 (defvar shell-command-switch "-c"
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
675 "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
676
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
677 (defun shell-command (command &optional output-buffer)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
678 "Execute string COMMAND in inferior shell; display output, if any.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
679 If COMMAND ends in ampersand, execute it asynchronously.
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
680 The output appears in the buffer `*Shell Command*'.
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
681
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
682 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
683 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
684 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
685 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
686 insert output in current buffer. (This cannot be done asynchronously.)
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
687 In either case, the output is inserted after point (leaving mark after it)."
4488
b0a70d8d9af4 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 4477
diff changeset
688 (interactive (list (read-from-minibuffer "Shell command: "
b0a70d8d9af4 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 4477
diff changeset
689 nil nil nil 'shell-command-history)
b0a70d8d9af4 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 4477
diff changeset
690 current-prefix-arg))
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
691 (if (and output-buffer
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
692 (not (or (bufferp output-buffer) (stringp output-buffer))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
693 (progn (barf-if-buffer-read-only)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
694 (push-mark)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
695 ;; We do not use -f for csh; we will not support broken use of
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
696 ;; .cshrcs. Even the BSD csh manual says to use
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
697 ;; "if ($?prompt) exit" before things which are not useful
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
698 ;; non-interactively. Besides, if someone wants their other
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
699 ;; aliases for shell commands then they can still have them.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
700 (call-process shell-file-name nil t nil
9779
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
701 shell-command-switch command)
3029
2bf7bd92bd43 (shell-command): Don't activate mark even momentarily.
Richard M. Stallman <rms@gnu.org>
parents: 2947
diff changeset
702 ;; This is like exchange-point-and-mark, but doesn't activate the mark.
2bf7bd92bd43 (shell-command): Don't activate mark even momentarily.
Richard M. Stallman <rms@gnu.org>
parents: 2947
diff changeset
703 ;; It is cleaner to avoid activation, even though the command
2bf7bd92bd43 (shell-command): Don't activate mark even momentarily.
Richard M. Stallman <rms@gnu.org>
parents: 2947
diff changeset
704 ;; loop would deactivate the mark because we inserted text.
2bf7bd92bd43 (shell-command): Don't activate mark even momentarily.
Richard M. Stallman <rms@gnu.org>
parents: 2947
diff changeset
705 (goto-char (prog1 (mark t)
2bf7bd92bd43 (shell-command): Don't activate mark even momentarily.
Richard M. Stallman <rms@gnu.org>
parents: 2947
diff changeset
706 (set-marker (mark-marker) (point)
2bf7bd92bd43 (shell-command): Don't activate mark even momentarily.
Richard M. Stallman <rms@gnu.org>
parents: 2947
diff changeset
707 (current-buffer)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
708 ;; Preserve the match data in case called from a program.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
709 (let ((data (match-data)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
710 (unwind-protect
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
711 (if (string-match "[ \t]*&[ \t]*$" command)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
712 ;; Command ending with ampersand means asynchronous.
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
713 (let ((buffer (get-buffer-create
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
714 (or output-buffer "*Shell-Command*")))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
715 (directory default-directory)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
716 proc)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
717 ;; Remove the ampersand.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
718 (setq command (substring command 0 (match-beginning 0)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
719 ;; If will kill a process, query first.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
720 (setq proc (get-buffer-process buffer))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
721 (if proc
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
722 (if (yes-or-no-p "A command is running. Kill it? ")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
723 (kill-process proc)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
724 (error "Shell command in progress")))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
725 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
726 (set-buffer buffer)
9065
e321617e3fc6 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 8998
diff changeset
727 (setq buffer-read-only nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
728 (erase-buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
729 (display-buffer buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
730 (setq default-directory directory)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
731 (setq proc (start-process "Shell" buffer
9779
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
732 shell-file-name
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
733 shell-command-switch command))
7076
3497b7f6f0e7 (shell-command): Remove space after `:' in mode-line-process.
Richard M. Stallman <rms@gnu.org>
parents: 7063
diff changeset
734 (setq mode-line-process '(":%s"))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
735 (set-process-sentinel proc 'shell-command-sentinel)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
736 (set-process-filter proc 'shell-command-filter)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
737 ))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
738 (shell-command-on-region (point) (point) command nil))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
739 (store-match-data data)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
740
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
741 ;; We have a sentinel to prevent insertion of a termination message
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
742 ;; in the buffer itself.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
743 (defun shell-command-sentinel (process signal)
6949
319678b541eb (shell-command-sentinel): Do nothing if buffer is dead.
Richard M. Stallman <rms@gnu.org>
parents: 6943
diff changeset
744 (if (and (memq (process-status process) '(exit signal))
319678b541eb (shell-command-sentinel): Do nothing if buffer is dead.
Richard M. Stallman <rms@gnu.org>
parents: 6943
diff changeset
745 (buffer-name (process-buffer process)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
746 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
747 (message "%s: %s."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
748 (car (cdr (cdr (process-command process))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
749 (substring signal 0 -1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
750 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
751 (set-buffer (process-buffer process))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
752 (setq mode-line-process nil))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
753 (delete-process process))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
754
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
755 (defun shell-command-filter (proc string)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
756 ;; Do save-excursion by hand so that we can leave point numerically unchanged
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
757 ;; despite an insertion immediately after it.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
758 (let* ((obuf (current-buffer))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
759 (buffer (process-buffer proc))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
760 opoint
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
761 (window (get-buffer-window buffer))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
762 (pos (window-start window)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
763 (unwind-protect
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
764 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
765 (set-buffer buffer)
6951
a517c80bbe8d (shell-command-filter): If point was at end, leave it at end.
Richard M. Stallman <rms@gnu.org>
parents: 6949
diff changeset
766 (or (= (point) (point-max))
a517c80bbe8d (shell-command-filter): If point was at end, leave it at end.
Richard M. Stallman <rms@gnu.org>
parents: 6949
diff changeset
767 (setq opoint (point)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
768 (goto-char (point-max))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
769 (insert-before-markers string))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
770 ;; insert-before-markers moved this marker: set it back.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
771 (set-window-start window pos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
772 ;; Finish our save-excursion.
6951
a517c80bbe8d (shell-command-filter): If point was at end, leave it at end.
Richard M. Stallman <rms@gnu.org>
parents: 6949
diff changeset
773 (if opoint
a517c80bbe8d (shell-command-filter): If point was at end, leave it at end.
Richard M. Stallman <rms@gnu.org>
parents: 6949
diff changeset
774 (goto-char opoint))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
775 (set-buffer obuf))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
776
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
777 (defun shell-command-on-region (start end command
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
778 &optional output-buffer interactive)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
779 "Execute string COMMAND in inferior shell with region as input.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
780 Normally display output (if any) in temp buffer `*Shell Command Output*';
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
781 Prefix arg means replace the region with it.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
782 Noninteractive args are START, END, COMMAND, FLAG.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
783 Noninteractively FLAG means insert output in place of text from START to END,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
784 and put point at the end, but don't alter the mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
785
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
786 If the output is one line, it is displayed in the echo area,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
787 but it is nonetheless available in buffer `*Shell Command Output*'
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
788 even though that buffer is not automatically displayed. If there is no output
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
789 or output is inserted in the current buffer then `*Shell Command Output*' is
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
790 deleted.
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
791
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
792 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
793 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
794 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
795 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
796 insert output in the current buffer.
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
797 In either case, the output is inserted after point (leaving mark after it)."
1481
5004c07a8250 (shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 1466
diff changeset
798 (interactive (list (region-beginning) (region-end)
4488
b0a70d8d9af4 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 4477
diff changeset
799 (read-from-minibuffer "Shell command on region: "
b0a70d8d9af4 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 4477
diff changeset
800 nil nil nil 'shell-command-history)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
801 current-prefix-arg
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
802 (prefix-numeric-value current-prefix-arg)))
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
803 (if (and output-buffer
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
804 (not (or (bufferp output-buffer) (stringp output-buffer))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
805 ;; Replace specified region with output from command.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
806 (let ((swap (and interactive (< (point) (mark)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
807 ;; Don't muck with mark
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
808 ;; unless called interactively.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
809 (and interactive (push-mark))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
810 (call-process-region start end shell-file-name t t nil
9779
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
811 shell-command-switch command)
8604
7fff44ad20c9 (shell-command-on-region): Don't delete current buffer.
Karl Heuer <kwzh@gnu.org>
parents: 8600
diff changeset
812 (let ((shell-buffer (get-buffer "*Shell Command Output*")))
7fff44ad20c9 (shell-command-on-region): Don't delete current buffer.
Karl Heuer <kwzh@gnu.org>
parents: 8600
diff changeset
813 (and shell-buffer (not (eq shell-buffer (current-buffer)))
7fff44ad20c9 (shell-command-on-region): Don't delete current buffer.
Karl Heuer <kwzh@gnu.org>
parents: 8600
diff changeset
814 (kill-buffer shell-buffer)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
815 (and interactive swap (exchange-point-and-mark)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
816 ;; No prefix argument: put the output in a temp buffer,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
817 ;; replacing its entire contents.
9539
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
818 (let ((buffer (get-buffer-create
164a7cb8d0ea (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 9434
diff changeset
819 (or output-buffer "*Shell Command Output*")))
5635
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
820 (success nil))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
821 (unwind-protect
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
822 (if (eq buffer (current-buffer))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
823 ;; If the input is the same buffer as the output,
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
824 ;; delete everything but the specified region,
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
825 ;; then replace that region with the output.
9065
e321617e3fc6 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 8998
diff changeset
826 (progn (setq buffer-read-only nil)
e321617e3fc6 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 8998
diff changeset
827 (delete-region end (point-max))
5635
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
828 (delete-region (point-min) start)
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
829 (call-process-region (point-min) (point-max)
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
830 shell-file-name t t nil
9779
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
831 shell-command-switch command)
5635
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
832 (setq success t))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
833 ;; Clear the output buffer, then run the command with output there.
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
834 (save-excursion
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
835 (set-buffer buffer)
9065
e321617e3fc6 (shell-command, shell-command-on-region):
Richard M. Stallman <rms@gnu.org>
parents: 8998
diff changeset
836 (setq buffer-read-only nil)
5635
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
837 (erase-buffer))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
838 (call-process-region start end shell-file-name
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
839 nil buffer nil
9779
1286985b5a26 (shell-command-switch): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9771
diff changeset
840 shell-command-switch command)
5635
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
841 (setq success t))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
842 ;; Report the amount of output.
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
843 (let ((lines (save-excursion
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
844 (set-buffer buffer)
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
845 (if (= (buffer-size) 0)
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
846 0
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
847 (count-lines (point-min) (point-max))))))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
848 (cond ((= lines 0)
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
849 (if success
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
850 (message "(Shell command completed with no output)"))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
851 (kill-buffer buffer))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
852 ((and success (= lines 1))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
853 (message "%s"
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
854 (save-excursion
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
855 (set-buffer buffer)
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
856 (goto-char (point-min))
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
857 (buffer-substring (point)
7426
58372be37e3a (shell-command-on-region): Don't kill output buffer when in the one line case.
Richard M. Stallman <rms@gnu.org>
parents: 7373
diff changeset
858 (progn (end-of-line) (point))))))
5635
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
859 (t
82a127d7ef7d (shell-command-on-region): If we quit the command,
Richard M. Stallman <rms@gnu.org>
parents: 5564
diff changeset
860 (set-window-start (display-buffer buffer) 1))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
861
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
862 (defun universal-argument ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
863 "Begin a numeric argument for the following command.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
864 Digits or minus sign following \\[universal-argument] make up the numeric argument.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
865 \\[universal-argument] following the digits or minus sign ends the argument.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
866 \\[universal-argument] without digits or minus sign provides 4 as argument.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
867 Repeating \\[universal-argument] without digits or minus sign
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
868 multiplies the argument by 4 each time."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
869 (interactive nil)
513
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
870 (let ((factor 4)
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
871 key)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
872 ;; (describe-arg (list factor) 1)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
873 (setq key (read-key-sequence nil t))
513
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
874 (while (equal (key-binding key) 'universal-argument)
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
875 (setq factor (* 4 factor))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
876 ;; (describe-arg (list factor) 1)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
877 (setq key (read-key-sequence nil t)))
513
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
878 (prefix-arg-internal key factor nil)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
879
513
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
880 (defun prefix-arg-internal (key factor value)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
881 (let ((sign 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
882 (if (and (numberp value) (< value 0))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
883 (setq sign -1 value (- value)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
884 (if (eq value '-)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
885 (setq sign -1 value nil))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
886 ;; (describe-arg value sign)
513
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
887 (while (equal key "-")
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
888 (setq sign (- sign) factor nil)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
889 ;; (describe-arg value sign)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
890 (setq key (read-key-sequence nil t)))
1039
8ab465f7a7ff *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 1027
diff changeset
891 (while (and (stringp key)
8ab465f7a7ff *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 1027
diff changeset
892 (= (length key) 1)
513
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
893 (not (string< key "0"))
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
894 (not (string< "9" key)))
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
895 (setq value (+ (* (if (numberp value) value 0) 10)
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
896 (- (aref key 0) ?0))
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
897 factor nil)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
898 ;; (describe-arg value sign)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
899 (setq key (read-key-sequence nil t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
900 (setq prefix-arg
513
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
901 (cond (factor (list factor))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
902 ((numberp value) (* value sign))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
903 ((= sign -1) '-)))
513
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
904 ;; Calling universal-argument after digits
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
905 ;; terminates the argument but is ignored.
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
906 (if (eq (key-binding key) 'universal-argument)
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
907 (progn
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
908 (describe-arg value sign)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
909 (setq key (read-key-sequence nil t))))
2023
019308ed8918 (prefix-arg-internal): Use listify-key-sequence.
Richard M. Stallman <rms@gnu.org>
parents: 1982
diff changeset
910 (setq unread-command-events (listify-key-sequence key))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
911
513
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
912 (defun describe-arg (value sign)
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
913 (cond ((numberp value)
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
914 (message "Arg: %d" (* value sign)))
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
915 ((consp value)
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
916 (message "Arg: [%d]" (car value)))
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
917 ((< sign 0)
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
918 (message "Arg: -"))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
919
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
920 (defun digit-argument (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
921 "Part of the numeric argument for the next command.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
922 \\[universal-argument] following digits or minus sign ends the argument."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
923 (interactive "P")
513
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
924 (prefix-arg-internal (char-to-string (logand last-command-char ?\177))
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
925 nil arg))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
926
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
927 (defun negative-argument (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
928 "Begin a negative numeric argument for the next command.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
929 \\[universal-argument] following digits or minus sign ends the argument."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
930 (interactive "P")
513
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
931 (prefix-arg-internal "-" nil arg))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
932
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
933 (defun forward-to-indentation (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
934 "Move forward ARG lines and position at first nonblank character."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
935 (interactive "p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
936 (forward-line arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
937 (skip-chars-forward " \t"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
938
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
939 (defun backward-to-indentation (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
940 "Move backward ARG lines and position at first nonblank character."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
941 (interactive "p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
942 (forward-line (- arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
943 (skip-chars-forward " \t"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
944
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
945 (defvar kill-whole-line nil
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
946 "*If non-nil, `kill-line' with no arg at beg of line kills the whole line.")
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
947
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
948 (defun kill-line (&optional arg)
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
949 "Kill the rest of the current line; if no nonblanks there, kill thru newline.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
950 With prefix argument, kill that many lines from point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
951 Negative arguments kill lines backward.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
952
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
953 When calling from a program, nil means \"no arg\",
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
954 a number counts as a prefix arg.
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
955
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
956 If `kill-whole-line' is non-nil, then kill the whole line
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
957 when given no argument at the beginning of a line."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
958 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
959 (kill-region (point)
7063
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
960 ;; It is better to move point to the other end of the kill
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
961 ;; before killing. That way, in a read-only buffer, point
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
962 ;; moves across the text that is copied to the kill ring.
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
963 ;; The choice has no effect on undo now that undo records
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
964 ;; the value of point from before the command was run.
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
965 (progn
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
966 (if arg
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
967 (forward-line (prefix-numeric-value arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
968 (if (eobp)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
969 (signal 'end-of-buffer nil))
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
970 (if (or (looking-at "[ \t]*$") (and kill-whole-line (bolp)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
971 (forward-line 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
972 (end-of-line)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
973 (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
974
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
975 ;;;; Window system cut and paste hooks.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
976
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
977 (defvar interprogram-cut-function nil
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
978 "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
979
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
980 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
981 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
982 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
983 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
984 programs.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
985
3034
dd65780e6246 (kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents: 3029
diff changeset
986 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
987 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
988 the text which should be made available.
dd65780e6246 (kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents: 3029
diff changeset
989 The second, PUSH, if non-nil means this is a \"new\" kill;
dd65780e6246 (kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents: 3029
diff changeset
990 nil means appending to an \"old\" kill.")
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
991
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
992 (defvar interprogram-paste-function nil
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
993 "Function to call to get text cut from other programs.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
994
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
995 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
996 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
997 This variable holds a function that Emacs calls to obtain
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
998 text that other programs have provided for pasting.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
999
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1000 The function should be called with no arguments. If the function
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1001 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
1002 of the Emacs kill ring should be used. If the function returns a
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1003 string, that string should be put in the kill ring as the latest kill.
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1004
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1005 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
1006 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
1007 most recent string, the function should return nil. If it is
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1008 difficult to tell whether Emacs or some other program provided the
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 715
diff changeset
1009 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
1010 is equal (according to `string=') to the last text Emacs provided.")
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1011
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1012
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1013
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1014 ;;;; The kill ring data structure.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1015
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1016 (defvar kill-ring nil
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1017 "List of killed text sequences.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1018 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
1019 facilities offered by window systems, use of this variable should
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1020 interact nicely with `interprogram-cut-function' and
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1021 `interprogram-paste-function'. The functions `kill-new',
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1022 `kill-append', and `current-kill' are supposed to implement this
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1023 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
1024 ring directly.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1025
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1026 (defconst kill-ring-max 30
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1027 "*Maximum length of kill ring before oldest elements are thrown away.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1028
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1029 (defvar kill-ring-yank-pointer nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1030 "The tail of the kill ring whose car is the last thing yanked.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1031
8763
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1032 (defun kill-new (string &optional replace)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1033 "Make STRING the latest kill in the kill ring.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1034 Set the 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
1035 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
1036 Optional second argument REPLACE non-nil means that STRING will replace
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1037 the front of the kill ring, rather than being added to the list."
8768
e2073805b688 (kill-new): Call menu-bar-update-yank-menu only if that function is defined.
Karl Heuer <kwzh@gnu.org>
parents: 8763
diff changeset
1038 (and (fboundp 'menu-bar-update-yank-menu)
e2073805b688 (kill-new): Call menu-bar-update-yank-menu only if that function is defined.
Karl Heuer <kwzh@gnu.org>
parents: 8763
diff changeset
1039 (menu-bar-update-yank-menu string (and replace (car kill-ring))))
8763
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1040 (if replace
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1041 (setcar kill-ring string)
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1042 (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
1043 (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
1044 (setcdr (nthcdr (1- kill-ring-max) kill-ring) nil)))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1045 (setq kill-ring-yank-pointer kill-ring)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1046 (if interprogram-cut-function
3034
dd65780e6246 (kill-new): Pass t as 2nd arg to interprogram-cut-function.
Richard M. Stallman <rms@gnu.org>
parents: 3029
diff changeset
1047 (funcall interprogram-cut-function string t)))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1048
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1049 (defun kill-append (string before-p)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1050 "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
1051 If BEFORE-P is non-nil, prepend STRING to the kill.
1760
05492c456293 (kill-append): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 1740
diff changeset
1052 If `interprogram-cut-function' is set, pass the resulting kill to
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1053 it."
8763
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1054 (kill-new (if before-p
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1055 (concat string (car kill-ring))
2b54e6deed2f (kill-new): New optional argument means replace most recent kill.
Karl Heuer <kwzh@gnu.org>
parents: 8734
diff changeset
1056 (concat (car kill-ring) string)) t))
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
1057
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1058 (defun current-kill (n &optional do-not-move)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1059 "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
1060 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
1061 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
1062 kill ring and returned as the latest kill.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1063 If optional arg DO-NOT-MOVE is non-nil, then don't actually move the
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1064 yanking point; just return the Nth kill forward."
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1065 (let ((interprogram-paste (and (= n 0)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1066 interprogram-paste-function
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1067 (funcall interprogram-paste-function))))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1068 (if interprogram-paste
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1069 (progn
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1070 ;; Disable the interprogram cut function when we add the new
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1071 ;; 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
1072 ;; selection, with identical text.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1073 (let ((interprogram-cut-function nil))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1074 (kill-new interprogram-paste))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1075 interprogram-paste)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1076 (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
1077 (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
1078 (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
1079 (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
1080 kill-ring)))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1081 (or do-not-move
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1082 (setq kill-ring-yank-pointer ARGth-kill-element))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1083 (car ARGth-kill-element)))))
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
1084
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1085
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1086
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1087 ;;;; Commands for manipulating the kill ring.
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
1088
7063
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1089 (defvar kill-read-only-ok nil
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1090 "*Non-nil means don't signal an error for killing read-only text.")
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1091
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1092 (defun kill-region (beg end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1093 "Kill between point and mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1094 The text is deleted but saved in the kill ring.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1095 The command \\[yank] can retrieve it from there.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1096 \(If you want to kill and then yank immediately, use \\[copy-region-as-kill].)
1834
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1097 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
1098 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
1099 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
1100
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1101 This is the primitive for programs to kill text (as opposed to deleting it).
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1102 Supply two arguments, character numbers indicating the stretch of text
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1103 to be killed.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1104 Any command that calls this function is a \"kill command\".
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1105 If the previous command was also a kill command,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1106 the text killed this time appends to the text killed last time
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1107 to make one entry in the kill ring."
1834
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1108 (interactive "r")
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1109 (cond
1834
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1110
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1111 ;; If the buffer is read-only, we should beep, in case the person
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1112 ;; just isn't aware of this. However, there's no harm in putting
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1113 ;; the region's text in the kill ring, anyway.
7063
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1114 ((or (and buffer-read-only (not inhibit-read-only))
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1115 (text-property-not-all beg end 'read-only nil))
1834
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1116 (copy-region-as-kill beg end)
1982
d65c1fefc636 * simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents: 1838
diff changeset
1117 ;; This should always barf, and give us the correct error.
7063
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1118 (if kill-read-only-ok
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1119 (message "Read only text copied to kill ring")
10012
4b936f4cad5c (kill-region): Set this-command unconditionally.
Karl Heuer <kwzh@gnu.org>
parents: 9876
diff changeset
1120 (setq this-command 'kill-region)
7063
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
1121 (barf-if-buffer-read-only)))
1834
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1122
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1123 ;; In certain cases, we can arrange for the undo list and the kill
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1124 ;; ring to share the same string object. This code does that.
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1125 ((not (or (eq buffer-undo-list t)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1126 (eq last-command 'kill-region)
10034
1c6132b72da9 (kill-region): Use = to compare positions.
Richard M. Stallman <rms@gnu.org>
parents: 10012
diff changeset
1127 ;; Use = since positions may be numbers or markers.
1c6132b72da9 (kill-region): Use = to compare positions.
Richard M. Stallman <rms@gnu.org>
parents: 10012
diff changeset
1128 (= beg end)))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1129 ;; Don't let the undo list be truncated before we can even access it.
3967
42932adb7074 (kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents: 3947
diff changeset
1130 (let ((undo-strong-limit (+ (- (max beg end) (min beg end)) 100))
42932adb7074 (kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents: 3947
diff changeset
1131 (old-list buffer-undo-list)
42932adb7074 (kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents: 3947
diff changeset
1132 tail)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1133 (delete-region beg end)
3967
42932adb7074 (kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents: 3947
diff changeset
1134 ;; Search back in buffer-undo-list for this string,
42932adb7074 (kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents: 3947
diff changeset
1135 ;; in case a change hook made property changes.
42932adb7074 (kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents: 3947
diff changeset
1136 (setq tail buffer-undo-list)
42932adb7074 (kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents: 3947
diff changeset
1137 (while (not (stringp (car (car tail))))
42932adb7074 (kill-region): Cope with change hooks that change props.
Richard M. Stallman <rms@gnu.org>
parents: 3947
diff changeset
1138 (setq tail (cdr tail)))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1139 ;; Take the same string recorded for undo
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1140 ;; and put it in the kill-ring.
10012
4b936f4cad5c (kill-region): Set this-command unconditionally.
Karl Heuer <kwzh@gnu.org>
parents: 9876
diff changeset
1141 (kill-new (car (car tail)))))
1834
9a1f696c1734 * simple.el (kill-region): If the buffer is read-only, do beep,
Jim Blandy <jimb@redhat.com>
parents: 1826
diff changeset
1142
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1143 (t
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1144 (copy-region-as-kill beg end)
10012
4b936f4cad5c (kill-region): Set this-command unconditionally.
Karl Heuer <kwzh@gnu.org>
parents: 9876
diff changeset
1145 (delete-region beg end)))
4b936f4cad5c (kill-region): Set this-command unconditionally.
Karl Heuer <kwzh@gnu.org>
parents: 9876
diff changeset
1146 (setq this-command 'kill-region))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1147
9876
75ecf866cfb8 Comment reason for preceding change.
Karl Heuer <kwzh@gnu.org>
parents: 9870
diff changeset
1148 ;; 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
1149 ;; 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
1150 ;; then corrects it with the intended C-w.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1151 (defun copy-region-as-kill (beg end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1152 "Save the region as if killed, but don't kill it.
617
cde1f15848c6 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 582
diff changeset
1153 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
1154 system cut and paste."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1155 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1156 (if (eq last-command 'kill-region)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1157 (kill-append (buffer-substring beg end) (< end beg))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1158 (kill-new (buffer-substring beg end)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1159 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1160
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1161 (defun kill-ring-save (beg end)
2111
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
1162 "Save the region as if killed, but don't kill it.
3467
002945794814 (kill-ring-save): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 3408
diff changeset
1163 This command is similar to `copy-region-as-kill', except that it gives
2111
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
1164 visual feedback indicating the extent of the region being copied.
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
1165 If `interprogram-cut-function' is non-nil, also save the text for a window
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
1166 system cut and paste."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1167 (interactive "r")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1168 (copy-region-as-kill beg end)
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
1169 (if (interactive-p)
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1170 (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
1171 (opoint (point))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1172 ;; 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
1173 ;; 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
1174 (inhibit-quit t))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1175 (if (pos-visible-in-window-p other-end (selected-window))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1176 (progn
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1177 ;; Swap point and mark.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1178 (set-marker (mark-marker) (point) (current-buffer))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1179 (goto-char other-end)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1180 (sit-for 1)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1181 ;; Swap back.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1182 (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
1183 (goto-char opoint)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1184 ;; If user quit, deactivate the mark
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1185 ;; 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
1186 (and quit-flag mark-active
4287
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1187 (deactivate-mark)))
2850
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1188 (let* ((killed-text (current-kill 0))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1189 (message-len (min (length killed-text) 40)))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1190 (if (= (point) beg)
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1191 ;; Don't say "killed"; that is misleading.
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1192 (message "Saved text until \"%s\""
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1193 (substring killed-text (- message-len)))
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1194 (message "Saved text from \"%s\""
f5f7e7295ec2 (keyboard-quit): Run deactivate-mark-hook.
Richard M. Stallman <rms@gnu.org>
parents: 2844
diff changeset
1195 (substring killed-text 0 message-len))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1196
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1197 (defun append-next-kill ()
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1198 "Cause following command, if it kills, to append to previous kill."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1199 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1200 (if (interactive-p)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1201 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1202 (setq this-command 'kill-region)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1203 (message "If the next command is a kill, it will append"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1204 (setq last-command 'kill-region)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1205
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1206 (defun yank-pop (arg)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1207 "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
1208 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
1209 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
1210 previously-killed text. `yank-pop' deletes that text and inserts in its
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1211 place a different stretch of killed text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1212
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1213 With no argument, the previous kill is inserted.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1214 With argument N, insert the Nth previous kill.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1215 If N is negative, this is a more recent kill.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1216
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1217 The sequence of kills wraps around, so that after the oldest one
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1218 comes the newest one."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1219 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1220 (if (not (eq last-command 'yank))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1221 (error "Previous command was not a yank"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1222 (setq this-command 'yank)
2805
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
1223 (let ((before (< (point) (mark t))))
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
1224 (delete-region (point) (mark t))
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1225 (set-marker (mark-marker) (point) (current-buffer))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1226 (insert (current-kill arg))
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1227 (if before
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1228 ;; 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
1229 ;; 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
1230 ;; 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
1231 (goto-char (prog1 (mark t)
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1232 (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
1233 nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1234
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1235 (defun yank (&optional arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1236 "Reinsert the last stretch of killed text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1237 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
1238 killed OR yanked. Put point at end, and set mark at beginning.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1239 With just C-u as argument, same but put point at beginning (and mark at end).
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1240 With argument N, reinsert the Nth most recently killed stretch of killed
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1241 text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1242 See also the command \\[yank-pop]."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1243 (interactive "*P")
5935
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
1244 ;; 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
1245 ;; for the following command.
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
1246 (setq this-command t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1247 (push-mark (point))
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1248 (insert (current-kill (cond
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1249 ((listp arg) 0)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1250 ((eq arg '-) -1)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1251 (t (1- arg)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1252 (if (consp arg)
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1253 ;; 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
1254 ;; 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
1255 ;; 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
1256 (goto-char (prog1 (mark t)
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1257 (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
1258 ;; If we do get all the way thru, make this-command indicate that.
a2b7fc4645d9 (undo, yank): Set this-command to t at start,
Richard M. Stallman <rms@gnu.org>
parents: 5893
diff changeset
1259 (setq this-command 'yank)
2111
d38d32084c15 * simple.el (kill-ring-save): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 2075
diff changeset
1260 nil)
715
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1261
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1262 (defun rotate-yank-pointer (arg)
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1263 "Rotate the yanking point in the kill ring.
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1264 With argument, rotate that many kills forward (or backward, if negative)."
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1265 (interactive "p")
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1266 (current-kill arg))
7af12ccaa6c1 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 658
diff changeset
1267
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1268
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1269 (defun insert-buffer (buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1270 "Insert after point the contents of BUFFER.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1271 Puts mark after the inserted text.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1272 BUFFER may be a buffer or a buffer name."
1331
dd2c33afcef2 (insert-buffer): Before reading arg, barf if read-only.
Richard M. Stallman <rms@gnu.org>
parents: 1321
diff changeset
1273 (interactive (list (progn (barf-if-buffer-read-only)
8998
25406f41c336 (insert-buffer): Default to first buffer other than current one.
Richard M. Stallman <rms@gnu.org>
parents: 8768
diff changeset
1274 (read-buffer "Insert buffer: "
25406f41c336 (insert-buffer): Default to first buffer other than current one.
Richard M. Stallman <rms@gnu.org>
parents: 8768
diff changeset
1275 (other-buffer (current-buffer) t)
25406f41c336 (insert-buffer): Default to first buffer other than current one.
Richard M. Stallman <rms@gnu.org>
parents: 8768
diff changeset
1276 t))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1277 (or (bufferp buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1278 (setq buffer (get-buffer buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1279 (let (start end newmark)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1280 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1281 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1282 (set-buffer buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1283 (setq start (point-min) end (point-max)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1284 (insert-buffer-substring buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1285 (setq newmark (point)))
1982
d65c1fefc636 * simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents: 1838
diff changeset
1286 (push-mark newmark))
d65c1fefc636 * simple.el (kill-region): If the buffer is read-only, call
Jim Blandy <jimb@redhat.com>
parents: 1838
diff changeset
1287 nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1288
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1289 (defun append-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1290 "Append to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1291 It is inserted into that buffer before its point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1292
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1293 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1294 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1295 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
1296 (interactive
10048
db01a04d2afb (append-to-buffer): Don't use current buffer as default.
Richard M. Stallman <rms@gnu.org>
parents: 10034
diff changeset
1297 (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
1298 (region-beginning) (region-end)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1299 (let ((oldbuf (current-buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1300 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1301 (set-buffer (get-buffer-create buffer))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1302 (insert-buffer-substring oldbuf start end))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1303
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1304 (defun prepend-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1305 "Prepend to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1306 It is inserted into that buffer after its point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1307
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1308 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1309 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1310 START and END specify the portion of the current buffer to be copied."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1311 (interactive "BPrepend to buffer: \nr")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1312 (let ((oldbuf (current-buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1313 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1314 (set-buffer (get-buffer-create buffer))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1315 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1316 (insert-buffer-substring oldbuf start end)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1317
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1318 (defun copy-to-buffer (buffer start end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1319 "Copy to specified buffer the text of the region.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1320 It is inserted into that buffer, replacing existing text there.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1321
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1322 When calling from a program, give three arguments:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1323 BUFFER (or buffer name), START and END.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1324 START and END specify the portion of the current buffer to be copied."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1325 (interactive "BCopy to buffer: \nr")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1326 (let ((oldbuf (current-buffer)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1327 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1328 (set-buffer (get-buffer-create buffer))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1329 (erase-buffer)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1330 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1331 (insert-buffer-substring oldbuf start end)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1332
3936
d42ad851d210 (mark-even-if-inactive): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3642
diff changeset
1333 (defvar mark-even-if-inactive nil
d42ad851d210 (mark-even-if-inactive): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3642
diff changeset
1334 "*Non-nil means you can use the mark even when inactive.
d42ad851d210 (mark-even-if-inactive): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3642
diff changeset
1335 This option makes a difference in Transient Mark mode.
d42ad851d210 (mark-even-if-inactive): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3642
diff changeset
1336 When the option is non-nil, deactivation of the mark
d42ad851d210 (mark-even-if-inactive): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3642
diff changeset
1337 turns off region highlighting, but commands that use the mark
d42ad851d210 (mark-even-if-inactive): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3642
diff changeset
1338 behave as if the mark were still active.")
d42ad851d210 (mark-even-if-inactive): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3642
diff changeset
1339
4040
d06d7295d3eb Put error-conditions and error-message properties on 'mark-inactive.
Roland McGrath <roland@gnu.org>
parents: 3967
diff changeset
1340 (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
1341 (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
1342
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
1343 (defun mark (&optional force)
3487
8c151ebeff9c (mark): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 3467
diff changeset
1344 "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
1345 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
1346 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
1347 if there is no mark at all.
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
1348
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1349 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
1350 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
1351 (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
1352 (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
1353 (signal 'mark-inactive nil)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1354
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
1355 ;; 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
1356 ;; run deactivate-mark-hook. This shorthand should simplify.
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
1357 (defsubst deactivate-mark ()
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
1358 "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
1359 \(That makes a difference only in Transient Mark mode.)
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
1360 Also runs the hook `deactivate-mark-hook'."
7726
0998ca7d922c (deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 7698
diff changeset
1361 (if transient-mark-mode
0998ca7d922c (deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 7698
diff changeset
1362 (progn
0998ca7d922c (deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 7698
diff changeset
1363 (setq mark-active nil)
0998ca7d922c (deactivate-mark): Do nothing unless transient-mark-mode.
Richard M. Stallman <rms@gnu.org>
parents: 7698
diff changeset
1364 (run-hooks 'deactivate-mark-hook))))
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
1365
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1366 (defun set-mark (pos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1367 "Set this buffer's mark to POS. Don't use this function!
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1368 That is to say, don't use this function unless you want
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1369 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
1370 mark position to be lost.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1371
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1372 Normally, when a new mark is set, the old one should go on the stack.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1373 This is why most applications should use push-mark, not set-mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1374
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1375 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
1376 purposes. The mark saves a location for the user's convenience.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1377 Most editing commands should not alter the mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1378 To remember a location for internal use in the Lisp program,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1379 store it in a Lisp variable. Example:
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1380
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1381 (let ((beg (point))) (forward-line 1) (delete-region beg (point)))."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1382
4287
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1383 (if pos
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1384 (progn
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1385 (setq mark-active t)
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1386 (run-hooks 'activate-mark-hook)
20486b99584f (kill-ring-save): Delete spurious `message' call.
Richard M. Stallman <rms@gnu.org>
parents: 4217
diff changeset
1387 (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
1388 ;; 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
1389 ;; 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
1390 ;; 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
1391 (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
1392 (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
1393 (set-marker (mark-marker) nil)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1394
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1395 (defvar mark-ring nil
8695
0f702e9ab06d (mark-ring): Add permanent-local prop. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 8660
diff changeset
1396 "The list of former marks of the current buffer, most recent first.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1397 (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
1398 (put 'mark-ring 'permanent-local t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1399
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1400 (defconst mark-ring-max 16
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1401 "*Maximum size of mark ring. Start discarding off end if gets this big.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1402
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1403 (defvar global-mark-ring nil
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1404 "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
1405
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1406 (defconst global-mark-ring-max 16
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1407 "*Maximum size of global mark ring. \
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1408 Start discarding off end if gets this big.")
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1409
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1410 (defun set-mark-command (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1411 "Set mark at where point is, or jump to mark.
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1412 With no prefix argument, set mark, push old mark position on local mark
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1413 ring, and push mark on global mark ring.
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1414 With argument, jump to mark, and pop a new position for mark off the ring
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1415 \(does not affect global mark ring\).
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1416
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1417 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
1418 purposes. See the documentation of `set-mark' for more information."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1419 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1420 (if (null arg)
2805
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
1421 (progn
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1422 (push-mark nil nil t))
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
1423 (if (null (mark t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1424 (error "No mark set in this buffer")
2805
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
1425 (goto-char (mark t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1426 (pop-mark))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1427
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
1428 (defun push-mark (&optional location nomsg activate)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1429 "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
1430 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
1431 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
1432 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
1433 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
1434
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
1435 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
1436 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
1437
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
1438 In Transient Mark mode, this does not activate the mark."
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
1439 (if (null (mark t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1440 nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1441 (setq mark-ring (cons (copy-marker (mark-marker)) mark-ring))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1442 (if (> (length mark-ring) mark-ring-max)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1443 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1444 (move-marker (car (nthcdr mark-ring-max mark-ring)) nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1445 (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
1446 (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
1447 ;; 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
1448 (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
1449 (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
1450 ;; 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
1451 ;; 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
1452 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
1453 (setq global-mark-ring (cons (copy-marker (mark-marker)) global-mark-ring))
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1454 (if (> (length global-mark-ring) global-mark-ring-max)
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1455 (progn
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1456 (move-marker (car (nthcdr global-mark-ring-max global-mark-ring))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1457 nil)
5812
1959e5c4a563 (push-mark): Don't push on global-mark-ring if its car is a marker in the
Roland McGrath <roland@gnu.org>
parents: 5811
diff changeset
1458 (setcdr (nthcdr (1- global-mark-ring-max) global-mark-ring) nil))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1459 (or nomsg executing-macro (> (minibuffer-depth) 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1460 (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
1461 (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
1462 (set-mark (mark t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1463 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1464
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1465 (defun pop-mark ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1466 "Pop off mark ring into the buffer's actual mark.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1467 Does not set point. Does nothing if mark ring is empty."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1468 (if mark-ring
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1469 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1470 (setq mark-ring (nconc mark-ring (list (copy-marker (mark-marker)))))
2805
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
1471 (set-marker (mark-marker) (+ 0 (car mark-ring)) (current-buffer))
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
1472 (deactivate-mark)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1473 (move-marker (car mark-ring) nil)
2805
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
1474 (if (null (mark t)) (ding))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1475 (setq mark-ring (cdr mark-ring)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1476
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1477 (define-function 'exchange-dot-and-mark 'exchange-point-and-mark)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1478 (defun exchange-point-and-mark ()
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
1479 "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
1480 This command works even when the mark is not active,
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
1481 and it reactivates the mark."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1482 (interactive nil)
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
1483 (let ((omark (mark t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1484 (if (null omark)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1485 (error "No mark set in this buffer"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1486 (set-mark (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1487 (goto-char omark)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1488 nil))
2796
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
1489
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
1490 (defun transient-mark-mode (arg)
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
1491 "Toggle Transient Mark mode.
2935
653e14f61220 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 2850
diff changeset
1492 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
1493
5372
ac927443eae9 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5343
diff changeset
1494 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
1495 Changing the buffer \"deactivates\" the mark.
ac927443eae9 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5343
diff changeset
1496 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
1497 but whose main purpose is something else--for example,
ac927443eae9 (transient-mark-mode): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 5343
diff changeset
1498 incremental search, \\[beginning-of-buffer], and \\[end-of-buffer]."
2796
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
1499 (interactive "P")
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
1500 (setq transient-mark-mode
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
1501 (if (null arg)
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
1502 (not transient-mark-mode)
e0a9c4815584 (transient-mark-mode): New command.
Richard M. Stallman <rms@gnu.org>
parents: 2681
diff changeset
1503 (> (prefix-numeric-value arg) 0))))
5811
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1504
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1505 (defun pop-global-mark ()
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1506 "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
1507 (interactive)
7881
4ab8723cd491 (pop-global-mark): Discard entries for nonexistent buffers.
Richard M. Stallman <rms@gnu.org>
parents: 7877
diff changeset
1508 ;; 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
1509 (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
1510 (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
1511 (or global-mark-ring
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1512 (error "No global mark set"))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1513 (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
1514 (buffer (marker-buffer marker))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1515 (position (marker-position marker)))
10351
e34cbd5276bd (pop-global-mark): Make pop-global-mark treat
Richard M. Stallman <rms@gnu.org>
parents: 10284
diff changeset
1516 (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
1517 (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
1518 (set-buffer buffer)
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1519 (or (and (>= position (point-min))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1520 (<= position (point-max)))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1521 (widen))
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1522 (goto-char position)
7cc27fc3c661 (global-mark-ring, global-mark-ring-max): New variables.
Roland McGrath <roland@gnu.org>
parents: 5805
diff changeset
1523 (switch-to-buffer buffer)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1524
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
1525 (defvar next-line-add-newlines t
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1526 "*If non-nil, `next-line' inserts newline to avoid `end of buffer' error.")
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
1527
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1528 (defun next-line (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1529 "Move cursor vertically down ARG lines.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1530 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
1531 the cursor is positioned after the character in that line which spans this
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1532 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
1533 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
1534 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
1535 to create a line, and moves the cursor to that line. Otherwise it moves the
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1536 cursor to the end of the buffer (if already at the end of the buffer, an error
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
1537 is signaled).
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1538
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1539 The command \\[set-goal-column] can be used to create
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1540 a semipermanent goal column to which this command always moves.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1541 Then it does not try to move vertically. This goal column is stored
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1542 in `goal-column', which is nil when there is none.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1543
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1544 If you are thinking of using this in a Lisp program, consider
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1545 using `forward-line' instead. It is usually easier to use
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1546 and more reliable (no dependence on goal column, etc.)."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1547 (interactive "p")
5675
3191bf405867 (next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents: 5635
diff changeset
1548 (if (and next-line-add-newlines (= arg 1))
3191bf405867 (next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents: 5635
diff changeset
1549 (let ((opoint (point)))
8309
a4dbf8e6c78f (line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents: 8203
diff changeset
1550 (end-of-line)
a4dbf8e6c78f (line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents: 8203
diff changeset
1551 (if (eobp)
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
1552 (newline 1)
5675
3191bf405867 (next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents: 5635
diff changeset
1553 (goto-char opoint)
3191bf405867 (next-line): Move error signaling and special end of
Richard M. Stallman <rms@gnu.org>
parents: 5635
diff changeset
1554 (line-move arg)))
10226
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1555 (if (interactive-p)
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1556 (condition-case nil
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1557 (line-move arg)
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1558 ((beginning-of-buffer end-of-buffer) (ding)))
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1559 (line-move arg)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1560 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1561
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1562 (defun previous-line (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1563 "Move cursor vertically up ARG lines.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1564 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
1565 the cursor is positioned after the character in that line which spans this
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1566 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
1567
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1568 The command \\[set-goal-column] can be used to create
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1569 a semipermanent goal column to which this command always moves.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1570 Then it does not try to move vertically.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1571
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1572 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
1573 `forward-line' with a negative argument instead. It is usually easier
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1574 to use and more reliable (no dependence on goal column, etc.)."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1575 (interactive "p")
10226
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1576 (if (interactive-p)
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1577 (condition-case nil
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1578 (line-move (- arg))
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1579 ((beginning-of-buffer end-of-buffer) (ding)))
1817c5332316 (next-line, previous-line): If interactive and not in
Richard M. Stallman <rms@gnu.org>
parents: 10165
diff changeset
1580 (line-move (- arg)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1581 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1582
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1583 (defconst track-eol nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1584 "*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
1585 This means moving to the end of each line moved onto.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1586 The beginning of a blank line does not count as the end of a line.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1587
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
1588 (defvar goal-column nil
04b4499061fd (goal-column): Don't put the defvar inside the make-variable-buffer-local.
Richard M. Stallman <rms@gnu.org>
parents: 1459
diff changeset
1589 "*Semipermanent goal column for vertical motion, as set by \\[set-goal-column], or nil.")
04b4499061fd (goal-column): Don't put the defvar inside the make-variable-buffer-local.
Richard M. Stallman <rms@gnu.org>
parents: 1459
diff changeset
1590 (make-variable-buffer-local 'goal-column)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1591
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1592 (defvar temporary-goal-column 0
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1593 "Current goal column for vertical motion.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1594 It is the column where point was
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1595 at the start of current run of vertical motion commands.
513
12facf6e03ed *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 475
diff changeset
1596 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
1597
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1598 (defun line-move (arg)
8080
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1599 (if (not (or (eq last-command 'next-line)
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1600 (eq last-command 'previous-line)))
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1601 (setq temporary-goal-column
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1602 (if (and track-eol (eolp)
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1603 ;; Don't count beg of empty line as end of line
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1604 ;; unless we just did explicit end-of-line.
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1605 (or (not (bolp)) (eq last-command 'end-of-line)))
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1606 9999
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1607 (current-column))))
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1608 (if (not (integerp selective-display))
8309
a4dbf8e6c78f (line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents: 8203
diff changeset
1609 (or (if (> arg 0)
a4dbf8e6c78f (line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents: 8203
diff changeset
1610 (progn (if (> arg 1) (forward-line (1- arg)))
a4dbf8e6c78f (line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents: 8203
diff changeset
1611 ;; This way of moving forward ARG lines
a4dbf8e6c78f (line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents: 8203
diff changeset
1612 ;; verifies that we have a newline after the last one.
a4dbf8e6c78f (line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents: 8203
diff changeset
1613 ;; It doesn't get confused by intangible text.
a4dbf8e6c78f (line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents: 8203
diff changeset
1614 (end-of-line)
a4dbf8e6c78f (line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents: 8203
diff changeset
1615 (zerop (forward-line 1)))
a4dbf8e6c78f (line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents: 8203
diff changeset
1616 (and (zerop (forward-line arg))
a4dbf8e6c78f (line-move, next-line): Check last line moved over
Richard M. Stallman <rms@gnu.org>
parents: 8203
diff changeset
1617 (bolp)))
9750
00490d140f2b (line-move): Use sign of arg to choose error condition.
Richard M. Stallman <rms@gnu.org>
parents: 9749
diff changeset
1618 (signal (if (< arg 0)
8080
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1619 'beginning-of-buffer
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1620 'end-of-buffer)
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1621 nil))
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1622 ;; Move by arg lines, but ignore invisible ones.
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1623 (while (> arg 0)
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1624 (end-of-line)
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1625 (and (zerop (vertical-motion 1))
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1626 (signal 'end-of-buffer nil))
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1627 (setq arg (1- arg)))
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1628 (while (< arg 0)
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1629 (beginning-of-line)
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1630 (and (zerop (vertical-motion -1))
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1631 (signal 'beginning-of-buffer nil))
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1632 (setq arg (1+ arg))))
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1633 (move-to-column (or goal-column temporary-goal-column))
fa224a1d7aa1 (line-move): Don't use message or ding; just signal errors.
Richard M. Stallman <rms@gnu.org>
parents: 8057
diff changeset
1634 nil)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1635
1771
3f0f18d4eb8c * simple.el (set-goal-column): Make this command disabled by default.
Jim Blandy <jimb@redhat.com>
parents: 1760
diff changeset
1636 ;;; 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
1637 ;;; 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
1638 (put 'set-goal-column 'disabled t)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1639
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1640 (defun set-goal-column (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1641 "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
1642 Those commands will move to this position in the line moved to
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1643 rather than trying to keep the same horizontal position.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1644 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
1645 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
1646 The goal column is stored in the variable `goal-column'."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1647 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1648 (if arg
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1649 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1650 (setq goal-column nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1651 (message "No goal column"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1652 (setq goal-column (current-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1653 (message (substitute-command-keys
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1654 "Goal column %d (use \\[set-goal-column] with an arg to unset it)")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1655 goal-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1656 nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1657
2597
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1658 ;;; Partial support for horizontal autoscrolling. Someday, this feature
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1659 ;;; will be built into the C level and all the (hscroll-point-visible) calls
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1660 ;;; will go away.
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1661
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1662 (defvar hscroll-step 0
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1663 "*The number of columns to try scrolling a window by when point moves out.
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1664 If that fails to bring point back on frame, point is centered instead.
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1665 If this is zero, point is always centered after it moves off frame.")
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1666
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1667 (defun hscroll-point-visible ()
6743
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1668 "Scrolls the selected window horizontally to make point visible."
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1669 (save-excursion
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1670 (set-buffer (window-buffer))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1671 (if (not (or truncate-lines
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1672 (> (window-hscroll) 0)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1673 (and truncate-partial-width-windows
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1674 (< (window-width) (frame-width)))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1675 ;; Point is always visible when lines are wrapped.
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1676 ()
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1677 ;; If point is on the invisible part of the line before window-start,
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1678 ;; then hscrolling can't bring it back, so reset window-start first.
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1679 (and (< (point) (window-start))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1680 (let ((ws-bol (save-excursion
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1681 (goto-char (window-start))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1682 (beginning-of-line)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1683 (point))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1684 (and (>= (point) ws-bol)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1685 (set-window-start nil ws-bol))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1686 (let* ((here (hscroll-window-column))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1687 (left (min (window-hscroll) 1))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1688 (right (1- (window-width))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1689 ;; Allow for the truncation glyph, if we're not exactly at eol.
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1690 (if (not (and (= here right)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1691 (= (following-char) ?\n)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1692 (setq right (1- right)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1693 (cond
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1694 ;; If too far away, just recenter. But don't show too much
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1695 ;; white space off the end of the line.
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1696 ((or (< here (- left hscroll-step))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1697 (> here (+ right hscroll-step)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1698 (let ((eol (save-excursion (end-of-line) (hscroll-window-column))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1699 (scroll-left (min (- here (/ (window-width) 2))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1700 (- eol (window-width) -5)))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1701 ;; Within range. Scroll by one step (or maybe not at all).
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1702 ((< here left)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1703 (scroll-right hscroll-step))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1704 ((> here right)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1705 (scroll-left hscroll-step)))))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1706
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1707 ;; This function returns the window's idea of the display column of point,
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1708 ;; assuming that the window is already known to be truncated rather than
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1709 ;; wrapped, and that we've already handled the case where point is on the
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1710 ;; part of the line before window-start. We ignore window-width; if point
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1711 ;; is beyond the right margin, we want to know how far. The return value
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1712 ;; includes the effects of window-hscroll, window-start, and the prompt
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1713 ;; string in the minibuffer. It may be negative due to hscroll.
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1714 (defun hscroll-window-column ()
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1715 (let* ((hscroll (window-hscroll))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1716 (startpos (save-excursion
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1717 (beginning-of-line)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1718 (if (= (point) (save-excursion
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1719 (goto-char (window-start))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1720 (beginning-of-line)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1721 (point)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1722 (goto-char (window-start)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1723 (point)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1724 (hpos (+ (if (and (eq (selected-window) (minibuffer-window))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1725 (= 1 (window-start))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1726 (= startpos (point-min)))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1727 (minibuffer-prompt-width)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1728 0)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1729 (min 0 (- 1 hscroll))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1730 val)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1731 (car (cdr (compute-motion startpos (cons hpos 0)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1732 (point) (cons 0 1)
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1733 1000000 (cons hscroll 0) nil)))))
77349221ca81 (hscroll-window-column): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6696
diff changeset
1734
2597
562d2dea4f05 (hscroll-step): New variable.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2577
diff changeset
1735
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1736 ;; rms: (1) The definitions of arrow keys should not simply restate
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1737 ;; what keys they are. The arrow keys should run the ordinary commands.
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1738 ;; (2) The arrow keys are just one of many common ways of moving point
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1739 ;; within a line. Real horizontal autoscrolling would be a good feature,
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1740 ;; but supporting it only for arrow keys is too incomplete to be desirable.
2577
b28675709d41 (down-arrow): New function. Uses next-line-add-newlines to suppress
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2568
diff changeset
1741
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1742 ;;;;; Make arrow keys do the right thing for improved terminal support
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1743 ;;;;; When we implement true horizontal autoscrolling, right-arrow and
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1744 ;;;;; left-arrow can lose the (if truncate-lines ...) clause and become
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1745 ;;;;; aliases. These functions are bound to the corresponding keyboard
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1746 ;;;;; events in loaddefs.el.
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
1747
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1748 ;;(defun right-arrow (arg)
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1749 ;; "Move right one character on the screen (with prefix ARG, that many chars).
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1750 ;;Scroll right if needed to keep point horizontally onscreen."
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1751 ;; (interactive "P")
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1752 ;; (forward-char arg)
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1753 ;; (hscroll-point-visible))
2577
b28675709d41 (down-arrow): New function. Uses next-line-add-newlines to suppress
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2568
diff changeset
1754
2608
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1755 ;;(defun left-arrow (arg)
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1756 ;; "Move left one character on the screen (with prefix ARG, that many chars).
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1757 ;;Scroll left if needed to keep point horizontally onscreen."
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1758 ;; (interactive "P")
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1759 ;; (backward-char arg)
cd5e799be39b (up-arrow, down-arrow, left-arrow, right-arrow): Deleted.
Richard M. Stallman <rms@gnu.org>
parents: 2597
diff changeset
1760 ;; (hscroll-point-visible))
8006
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
1761
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
1762 (defun scroll-other-window-down (lines)
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
1763 "Scroll the \"other window\" down."
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
1764 (interactive "P")
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
1765 (scroll-other-window
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
1766 ;; Just invert the argument's meaning.
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
1767 ;; 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
1768 (if (eq lines '-) nil
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
1769 (if (null lines) '-
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
1770 (- (prefix-numeric-value lines))))))
8057
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1771
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1772 (defun beginning-of-buffer-other-window (arg)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1773 "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
1774 Leave mark at previous position.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1775 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
1776 (interactive "P")
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1777 (let ((orig-window (selected-window))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1778 (window (other-window-for-scrolling)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1779 ;; 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
1780 ;; 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
1781 (unwind-protect
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1782 (progn
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1783 (select-window window)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1784 ;; Set point and mark in that window's buffer.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1785 (beginning-of-buffer arg)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1786 ;; Set point accordingly.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1787 (recenter '(t)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1788 (select-window orig-window))))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1789
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1790 (defun end-of-buffer-other-window (arg)
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1791 "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
1792 Leave mark at previous position.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1793 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
1794 (interactive "P")
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1795 ;; See beginning-of-buffer-other-window for comments.
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1796 (let ((orig-window (selected-window))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1797 (window (other-window-for-scrolling)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1798 (unwind-protect
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1799 (progn
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1800 (select-window window)
8442
05efaa4966e0 (end-of-buffer-other-window): Go to the end, not to the beginning.
Richard M. Stallman <rms@gnu.org>
parents: 8380
diff changeset
1801 (end-of-buffer arg)
8057
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1802 (recenter '(t)))
11a0c2f22d7e (beginning-of-buffer-other-window)
Richard M. Stallman <rms@gnu.org>
parents: 8006
diff changeset
1803 (select-window orig-window))))
2568
15014ba142a7 All fsets changed to defaliases.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2446
diff changeset
1804
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1805 (defun transpose-chars (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1806 "Interchange characters around point, moving forward one character.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1807 With prefix arg ARG, effect is to take character before point
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1808 and drag it forward past ARG other characters (backward if ARG negative).
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1809 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
1810 (interactive "*P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1811 (and (null arg) (eolp) (forward-char -1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1812 (transpose-subr 'forward-char (prefix-numeric-value arg)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1813
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1814 (defun transpose-words (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1815 "Interchange words around point, leaving point at end of them.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1816 With prefix arg ARG, effect is to take word before or around point
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1817 and drag it forward past ARG other words (backward if ARG negative).
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1818 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
1819 are interchanged."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1820 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1821 (transpose-subr 'forward-word arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1822
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1823 (defun transpose-sexps (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1824 "Like \\[transpose-words] but applies to sexps.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1825 Does not work on a sexp that point is in the middle of
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1826 if it is a list or string."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1827 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1828 (transpose-subr 'forward-sexp arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1829
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1830 (defun transpose-lines (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1831 "Exchange current line and previous line, leaving point after both.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1832 With argument ARG, takes previous line and moves it past ARG lines.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1833 With argument 0, interchanges line point is in with line mark is in."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1834 (interactive "*p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1835 (transpose-subr (function
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1836 (lambda (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1837 (if (= arg 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1838 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1839 ;; Move forward over a line,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1840 ;; but create a newline if none exists yet.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1841 (end-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1842 (if (eobp)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1843 (newline)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1844 (forward-char 1)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1845 (forward-line arg))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1846 arg))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1847
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1848 (defun transpose-subr (mover arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1849 (let (start1 end1 start2 end2)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1850 (if (= arg 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1851 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1852 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1853 (funcall mover 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1854 (setq end2 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1855 (funcall mover -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1856 (setq start2 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1857 (goto-char (mark))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1858 (funcall mover 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1859 (setq end1 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1860 (funcall mover -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1861 (setq start1 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1862 (transpose-subr-1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1863 (exchange-point-and-mark)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1864 (while (> arg 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1865 (funcall mover -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1866 (setq start1 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1867 (funcall mover 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1868 (setq end1 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1869 (funcall mover 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1870 (setq end2 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1871 (funcall mover -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1872 (setq start2 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1873 (transpose-subr-1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1874 (goto-char end2)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1875 (setq arg (1- arg)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1876 (while (< arg 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1877 (funcall mover -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1878 (setq start2 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1879 (funcall mover -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1880 (setq start1 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1881 (funcall mover 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1882 (setq end1 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1883 (funcall mover 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1884 (setq end2 (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1885 (transpose-subr-1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1886 (setq arg (1+ arg)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1887
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1888 (defun transpose-subr-1 ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1889 (if (> (min end1 end2) (max start1 start2))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1890 (error "Don't have two things to transpose"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1891 (let ((word1 (buffer-substring start1 end1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1892 (word2 (buffer-substring start2 end2)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1893 (delete-region start2 end2)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1894 (goto-char start2)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1895 (insert word1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1896 (goto-char (if (< start1 start2) start1
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1897 (+ start1 (- (length word1) (length word2)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1898 (delete-char (length word1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1899 (insert word2)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1900
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1901 (defconst comment-column 32
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1902 "*Column to indent right-margin comments to.
1581
9de0900ca56a * simple.el (comment-column): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1556
diff changeset
1903 Setting this variable automatically makes it local to the current buffer.
9de0900ca56a * simple.el (comment-column): Doc fix.
Jim Blandy <jimb@redhat.com>
parents: 1556
diff changeset
1904 Each mode establishes a different default value for this variable; you
6237
7c95bb9f534b (comment-column): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 6174
diff changeset
1905 can set the value for a particular mode using that mode's hook.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1906 (make-variable-buffer-local 'comment-column)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1907
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1908 (defconst comment-start nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1909 "*String to insert to start a new comment, or nil if no comment syntax defined.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1910
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1911 (defconst comment-start-skip nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1912 "*Regexp to match the start of a comment plus everything up to its body.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1913 If there are any \\(...\\) pairs, the comment delimiter text is held to begin
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1914 at the place matched by the close of the first pair.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1915
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1916 (defconst comment-end ""
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1917 "*String to insert to end a new comment.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1918 Should be an empty string if comments are terminated by end-of-line.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1919
2299
53abb56a18fa * simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents: 2215
diff changeset
1920 (defconst comment-indent-hook nil
53abb56a18fa * simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents: 2215
diff changeset
1921 "Obsolete variable for function to compute desired indentation for a comment.
53abb56a18fa * simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents: 2215
diff changeset
1922 This function is called with no args with point at the beginning of
53abb56a18fa * simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents: 2215
diff changeset
1923 the comment's starting delimiter.")
53abb56a18fa * simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents: 2215
diff changeset
1924
53abb56a18fa * simple.el (comment-indent-function): New variable, intended to
Jim Blandy <jimb@redhat.com>
parents: 2215
diff changeset
1925 (defconst comment-indent-function
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1926 '(lambda () comment-column)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1927 "Function to compute desired indentation for a comment.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1928 This function is called with no args with point at the beginning of
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1929 the comment's starting delimiter.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1930
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1931 (defun indent-for-comment ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1932 "Indent this line's comment to comment column, or insert an empty comment."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1933 (interactive "*")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1934 (beginning-of-line 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1935 (if (null comment-start)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1936 (error "No comment syntax defined")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1937 (let* ((eolpos (save-excursion (end-of-line) (point)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1938 cpos indent begpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1939 (if (re-search-forward comment-start-skip eolpos 'move)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1940 (progn (setq cpos (point-marker))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1941 ;; Find the start of the comment delimiter.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1942 ;; If there were paren-pairs in comment-start-skip,
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1943 ;; position at the end of the first pair.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1944 (if (match-end 1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1945 (goto-char (match-end 1))
2446
11ca45403cf5 (indent-for-comment): Use skip-syntax-backward in place of
Roland McGrath <roland@gnu.org>
parents: 2421
diff changeset
1946 ;; If comment-start-skip matched a string with
11ca45403cf5 (indent-for-comment): Use skip-syntax-backward in place of
Roland McGrath <roland@gnu.org>
parents: 2421
diff changeset
1947 ;; internal whitespace (not final whitespace) then
11ca45403cf5 (indent-for-comment): Use skip-syntax-backward in place of
Roland McGrath <roland@gnu.org>
parents: 2421
diff changeset
1948 ;; the delimiter start at the end of that
11ca45403cf5 (indent-for-comment): Use skip-syntax-backward in place of
Roland McGrath <roland@gnu.org>
parents: 2421
diff changeset
1949 ;; whitespace. Otherwise, it starts at the
11ca45403cf5 (indent-for-comment): Use skip-syntax-backward in place of
Roland McGrath <roland@gnu.org>
parents: 2421
diff changeset
1950 ;; beginning of what was matched.
11ca45403cf5 (indent-for-comment): Use skip-syntax-backward in place of
Roland McGrath <roland@gnu.org>
parents: 2421
diff changeset
1951 (skip-syntax-backward " " (match-beginning 0))
11ca45403cf5 (indent-for-comment): Use skip-syntax-backward in place of
Roland McGrath <roland@gnu.org>
parents: 2421
diff changeset
1952 (skip-syntax-backward "^ " (match-beginning 0)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1953 (setq begpos (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1954 ;; Compute desired indent.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1955 (if (= (current-column)
2446
11ca45403cf5 (indent-for-comment): Use skip-syntax-backward in place of
Roland McGrath <roland@gnu.org>
parents: 2421
diff changeset
1956 (setq indent (if comment-indent-hook
11ca45403cf5 (indent-for-comment): Use skip-syntax-backward in place of
Roland McGrath <roland@gnu.org>
parents: 2421
diff changeset
1957 (funcall comment-indent-hook)
11ca45403cf5 (indent-for-comment): Use skip-syntax-backward in place of
Roland McGrath <roland@gnu.org>
parents: 2421
diff changeset
1958 (funcall comment-indent-function))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1959 (goto-char begpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1960 ;; If that's different from current, change it.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1961 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1962 (delete-region (point) begpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1963 (indent-to indent))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1964 ;; An existing comment?
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1965 (if cpos
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1966 (progn (goto-char cpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1967 (set-marker cpos nil))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1968 ;; No, insert one.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1969 (insert comment-start)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1970 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1971 (insert comment-end))))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1972
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1973 (defun set-comment-column (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1974 "Set the comment column based on point.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1975 With no arg, set the comment column to the current column.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1976 With just minus as arg, kill any comment on this line.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1977 With any other arg, set comment column to indentation of the previous comment
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1978 and then align or create a comment on this line at that column."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1979 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1980 (if (eq arg '-)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1981 (kill-comment nil)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1982 (if arg
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1983 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1984 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1985 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1986 (re-search-backward comment-start-skip)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1987 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1988 (re-search-forward comment-start-skip)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1989 (goto-char (match-beginning 0))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1990 (setq comment-column (current-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1991 (message "Comment column set to %d" comment-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1992 (indent-for-comment))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1993 (setq comment-column (current-column))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1994 (message "Comment column set to %d" comment-column))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1995
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1996 (defun kill-comment (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1997 "Kill the comment on this line, if any.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1998 With argument, kill comments on that many lines starting with this one."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1999 ;; this function loses in a lot of situations. it incorrectly recognises
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2000 ;; comment delimiters sometimes (ergo, inside a string), doesn't work
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2001 ;; with multi-line comments, can kill extra whitespace if comment wasn't
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2002 ;; through end-of-line, et cetera.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2003 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2004 (or comment-start-skip (error "No comment syntax defined"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2005 (let ((count (prefix-numeric-value arg)) endc)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2006 (while (> count 0)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2007 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2008 (end-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2009 (setq endc (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2010 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2011 (and (string< "" comment-end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2012 (setq endc
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2013 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2014 (re-search-forward (regexp-quote comment-end) endc 'move)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2015 (skip-chars-forward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2016 (point))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2017 (beginning-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2018 (if (re-search-forward comment-start-skip endc t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2019 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2020 (goto-char (match-beginning 0))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2021 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2022 (kill-region (point) endc)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2023 ;; to catch comments a line beginnings
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2024 (indent-according-to-mode))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2025 (if arg (forward-line 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2026 (setq count (1- count)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2027
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2028 (defun comment-region (beg end &optional arg)
5730
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2029 "Comment or uncomment each line in the region.
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2030 With just C-u prefix arg, uncomment each line in region.
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2031 Numeric prefix arg ARG means use ARG comment characters.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2032 If ARG is negative, delete that many comment characters instead.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2033 Comments are terminated on each line, even for syntax in which newline does
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2034 not end the comment. Blank lines do not get comments."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2035 ;; if someone wants it to only put a comment-start at the beginning and
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2036 ;; comment-end at the end then typing it, C-x C-x, closing it, C-x C-x
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2037 ;; is easy enough. No option is made here for other than commenting
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2038 ;; every line.
5730
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2039 (interactive "r\nP")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2040 (or comment-start (error "No comment syntax is defined"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2041 (if (> beg end) (let (mid) (setq mid beg beg end end mid)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2042 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2043 (save-restriction
5730
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2044 (let ((cs comment-start) (ce comment-end)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2045 numarg)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2046 (if (consp arg) (setq numarg t)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2047 (setq numarg (prefix-numeric-value arg))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2048 ;; For positive arg > 1, replicate the comment delims now,
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2049 ;; then insert the replicated strings just once.
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2050 (while (> numarg 1)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2051 (setq cs (concat cs comment-start)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2052 ce (concat ce comment-end))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2053 (setq numarg (1- numarg))))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2054 ;; Loop over all lines from BEG to END.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2055 (narrow-to-region beg end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2056 (goto-char beg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2057 (while (not (eobp))
5730
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2058 (if (or (eq numarg t) (< numarg 0))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2059 (progn
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2060 ;; Delete comment start from beginning of line.
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2061 (if (eq numarg t)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2062 (while (looking-at (regexp-quote cs))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2063 (delete-char (length cs)))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2064 (let ((count numarg))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2065 (while (and (> 1 (setq count (1+ count)))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2066 (looking-at (regexp-quote cs)))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2067 (delete-char (length cs)))))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2068 ;; Delete comment end from end of line.
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2069 (if (string= "" ce)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2070 nil
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2071 (if (eq numarg t)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2072 (progn
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2073 (end-of-line)
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2074 ;; This is questionable if comment-end ends in
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2075 ;; whitespace. That is pretty brain-damaged,
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2076 ;; though.
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2077 (skip-chars-backward " \t")
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2078 (if (and (>= (- (point) (point-min)) (length ce))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2079 (save-excursion
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2080 (backward-char (length ce))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2081 (looking-at (regexp-quote ce))))
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2082 (delete-char (- (length ce)))))
5767
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2083 (let ((count numarg))
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2084 (while (> 1 (setq count (1+ count)))
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2085 (end-of-line)
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2086 ;; this is questionable if comment-end ends in whitespace
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2087 ;; that is pretty brain-damaged though
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2088 (skip-chars-backward " \t")
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2089 (save-excursion
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2090 (backward-char (length ce))
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2091 (if (looking-at (regexp-quote ce))
8fef255fe6b3 (comment-region): Fix previous change.
Richard M. Stallman <rms@gnu.org>
parents: 5764
diff changeset
2092 (delete-char (length ce))))))))
1459
a7394244aa9a (comment-region): Do move to next line, in neg arg case.
Richard M. Stallman <rms@gnu.org>
parents: 1331
diff changeset
2093 (forward-line 1))
5730
5810e7311c05 (comment-region): Handle comment-end deletion for C-u.
Richard M. Stallman <rms@gnu.org>
parents: 5675
diff changeset
2094 ;; Insert at beginning and at end.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2095 (if (looking-at "[ \t]*$") ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2096 (insert cs)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2097 (if (string= "" ce) ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2098 (end-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2099 (insert ce)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2100 (search-forward "\n" nil 'move)))))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2101
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2102 (defun backward-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2103 "Move backward until encountering the end of a word.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2104 With argument, do this that many times.
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2105 In programs, it is faster to call `forward-word' with negative arg."
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
2106 (interactive "p")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2107 (forward-word (- arg)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2108
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2109 (defun mark-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2110 "Set mark arg words away from point."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2111 (interactive "p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2112 (push-mark
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2113 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2114 (forward-word arg)
2824
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2115 (point))
c684bce3e977 (yank, yank-pop): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2805
diff changeset
2116 nil t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2117
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2118 (defun kill-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2119 "Kill characters forward until encountering the end of a word.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2120 With argument, do this that many times."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2121 (interactive "p")
7063
9a0d189fd877 (kill-line, kill-word): Don't use save-excursion.
Richard M. Stallman <rms@gnu.org>
parents: 6951
diff changeset
2122 (kill-region (point) (progn (forward-word arg) (point))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2123
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2124 (defun backward-kill-word (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2125 "Kill characters backward until encountering the end of a word.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2126 With argument, do this that many times."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2127 (interactive "p")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2128 (kill-word (- arg)))
2416
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2129
6174
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2130 (defun current-word (&optional strict)
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2131 "Return the word point is on (or a nearby word) as a string.
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2132 If optional arg STRICT is non-nil, return nil unless point is within
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2133 or adjacent to a word."
2416
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2134 (save-excursion
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2135 (let ((oldpoint (point)) (start (point)) (end (point)))
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2136 (skip-syntax-backward "w_") (setq start (point))
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2137 (goto-char oldpoint)
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2138 (skip-syntax-forward "w_") (setq end (point))
cd01176e9dc5 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2315
diff changeset
2139 (if (and (eq start oldpoint) (eq end oldpoint))
6174
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2140 ;; Point is neither within nor adjacent to a word.
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2141 (and (not strict)
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2142 (progn
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2143 ;; Look for preceding word in same line.
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2144 (skip-syntax-backward "^w_"
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2145 (save-excursion (beginning-of-line)
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2146 (point)))
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2147 (if (bolp)
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2148 ;; No preceding word in same line.
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2149 ;; Look for following word in same line.
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2150 (progn
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2151 (skip-syntax-forward "^w_"
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2152 (save-excursion (end-of-line)
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2153 (point)))
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2154 (setq start (point))
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2155 (skip-syntax-forward "w_")
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2156 (setq end (point)))
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2157 (setq end (point))
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2158 (skip-syntax-backward "w_")
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2159 (setq start (point)))
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2160 (buffer-substring start end)))
3902f1241d1c (current-word): Check properly for bolp. New optional arg STRICT. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 6160
diff changeset
2161 (buffer-substring start end)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2162
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2163 (defconst fill-prefix nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2164 "*String for filling to insert at front of new line, or nil for none.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2165 Setting this variable automatically makes it local to the current buffer.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2166 (make-variable-buffer-local 'fill-prefix)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2167
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2168 (defconst auto-fill-inhibit-regexp nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2169 "*Regexp to match lines which should not be auto-filled.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2170
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2171 (defun do-auto-fill ()
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2172 (let (fc justify bol give-up)
10471
3eb77f03f53e (do-auto-fill): justification renamed to current-justification.
Richard M. Stallman <rms@gnu.org>
parents: 10469
diff changeset
2173 (if (or (not (setq justify (current-justification)))
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2174 (and (setq fc (current-fill-column)) ; make sure this gets set
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2175 (eq justify 'left)
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2176 (<= (current-column) (setq fc (current-fill-column))))
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2177 (save-excursion (beginning-of-line)
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2178 (setq bol (point))
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2179 (and auto-fill-inhibit-regexp
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2180 (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
2181 nil ;; Auto-filling not required
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2182 ;; Remove justification-introduced whitespace before filling
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2183 (cond ((eq 'left justify) nil)
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2184 ((eq 'full justify) ; full justify: remove extra spaces
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2185 (canonically-space-region
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2186 (point) (save-excursion (end-of-line) (point))))
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2187 ;; right or center justify: remove extra indentation.
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2188 (t (save-excursion (indent-according-to-mode))))
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2189 (while (and (not give-up) (> (current-column) fc))
5769
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2190 ;; Determine where to split the line.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2191 (let ((fill-point
5769
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2192 (let ((opoint (point))
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2193 bounce
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2194 (first t))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2195 (save-excursion
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2196 (move-to-column (1+ fc))
5769
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2197 ;; Move back to a word boundary.
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2198 (while (or first
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2199 ;; If this is after period and a single space,
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2200 ;; move back once more--we don't want to break
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2201 ;; the line there and make it look like a
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2202 ;; sentence end.
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2203 (and (not (bobp))
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2204 (not bounce)
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2205 sentence-end-double-space
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2206 (save-excursion (forward-char -1)
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2207 (and (looking-at "\\. ")
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2208 (not (looking-at "\\. "))))))
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2209 (setq first nil)
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2210 (skip-chars-backward "^ \t\n")
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2211 ;; If we find nowhere on the line to break it,
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2212 ;; break after one word. Set bounce to t
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2213 ;; so we will not keep going in this while loop.
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2214 (if (bolp)
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2215 (progn
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2216 (re-search-forward "[ \t]" opoint t)
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2217 (setq bounce t)))
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2218 (skip-chars-backward " \t"))
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2219 ;; Let fill-point be set to the place where we end up.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2220 (point)))))
5769
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2221 ;; If that place is not the beginning of the line,
95188ebbb0bc (do-auto-fill): Don't break line at period-single-space.
Richard M. Stallman <rms@gnu.org>
parents: 5767
diff changeset
2222 ;; break the line there.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2223 (if (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2224 (goto-char fill-point)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2225 (not (bolp)))
4477
7101a887f80d (do-auto-fill): Don't keep breaking the line
Richard M. Stallman <rms@gnu.org>
parents: 4374
diff changeset
2226 (let ((prev-column (current-column)))
7101a887f80d (do-auto-fill): Don't keep breaking the line
Richard M. Stallman <rms@gnu.org>
parents: 4374
diff changeset
2227 ;; If point is at the fill-point, do not `save-excursion'.
7101a887f80d (do-auto-fill): Don't keep breaking the line
Richard M. Stallman <rms@gnu.org>
parents: 4374
diff changeset
2228 ;; Otherwise, if a comment prefix or fill-prefix is inserted,
7101a887f80d (do-auto-fill): Don't keep breaking the line
Richard M. Stallman <rms@gnu.org>
parents: 4374
diff changeset
2229 ;; point will end up before it rather than after it.
7101a887f80d (do-auto-fill): Don't keep breaking the line
Richard M. Stallman <rms@gnu.org>
parents: 4374
diff changeset
2230 (if (save-excursion
7101a887f80d (do-auto-fill): Don't keep breaking the line
Richard M. Stallman <rms@gnu.org>
parents: 4374
diff changeset
2231 (skip-chars-backward " \t")
7101a887f80d (do-auto-fill): Don't keep breaking the line
Richard M. Stallman <rms@gnu.org>
parents: 4374
diff changeset
2232 (= (point) fill-point))
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
2233 (indent-new-comment-line t)
4477
7101a887f80d (do-auto-fill): Don't keep breaking the line
Richard M. Stallman <rms@gnu.org>
parents: 4374
diff changeset
2234 (save-excursion
7101a887f80d (do-auto-fill): Don't keep breaking the line
Richard M. Stallman <rms@gnu.org>
parents: 4374
diff changeset
2235 (goto-char fill-point)
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
2236 (indent-new-comment-line t)))
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2237 ;; Now do justification, if required
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2238 (if (not (eq justify 'left))
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2239 (save-excursion
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2240 (end-of-line 0)
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2241 (justify-current-line justify nil t)))
4477
7101a887f80d (do-auto-fill): Don't keep breaking the line
Richard M. Stallman <rms@gnu.org>
parents: 4374
diff changeset
2242 ;; If making the new line didn't reduce the hpos of
7101a887f80d (do-auto-fill): Don't keep breaking the line
Richard M. Stallman <rms@gnu.org>
parents: 4374
diff changeset
2243 ;; the end of the line, then give up now;
7101a887f80d (do-auto-fill): Don't keep breaking the line
Richard M. Stallman <rms@gnu.org>
parents: 4374
diff changeset
2244 ;; trying again will not help.
7101a887f80d (do-auto-fill): Don't keep breaking the line
Richard M. Stallman <rms@gnu.org>
parents: 4374
diff changeset
2245 (if (>= (current-column) prev-column)
7101a887f80d (do-auto-fill): Don't keep breaking the line
Richard M. Stallman <rms@gnu.org>
parents: 4374
diff changeset
2246 (setq give-up t)))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2247 ;; No place to break => stop trying.
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2248 (setq give-up t))))
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2249 ;; justify last line
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2250 (justify-current-line justify t t))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2251
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2252 (defun auto-fill-mode (&optional arg)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2253 "Toggle auto-fill mode.
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2254 With arg, turn Auto-Fill mode on if and only if arg is positive.
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2255 In Auto-Fill mode, inserting a space at a column beyond `current-fill-column'
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2256 automatically breaks the line at a previous space."
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2257 (interactive "P")
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2258 (prog1 (setq auto-fill-function
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2259 (if (if (null arg)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2260 (not auto-fill-function)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2261 (> (prefix-numeric-value arg) 0))
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2262 'do-auto-fill
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2263 nil))
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2264 ;; update mode-line
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2265 (set-buffer-modified-p (buffer-modified-p))))
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2266
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2267 ;; 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
2268 (defun auto-fill-function ()
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2269 "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
2270 nil)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2271
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2272 (defun turn-on-auto-fill ()
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2273 "Unconditionally turn on Auto Fill mode."
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2274 (auto-fill-mode 1))
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2275
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2276 (defun set-fill-column (arg)
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2277 "Set `fill-column' to current column, or to argument if given.
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2278 The variable `fill-column' has a separate value for each buffer."
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2279 (interactive "P")
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2280 (setq fill-column (if (integerp arg) arg (current-column)))
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2281 (message "fill-column set to %d" fill-column))
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2282
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2283 (defconst comment-multi-line nil
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2284 "*Non-nil means \\[indent-new-comment-line] should continue same comment
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2285 on new line, with no new terminator or starter.
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2286 This is obsolete because you might as well use \\[newline-and-indent].")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2287
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
2288 (defun indent-new-comment-line (&optional soft)
6907
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2289 "Break line at point and indent, continuing comment if within one.
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2290 This indents the body of the continued comment
35e524a24c7f (auto-fill-function): New function (doc placeholder).
Richard M. Stallman <rms@gnu.org>
parents: 6837
diff changeset
2291 under the previous comment line.
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2292
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2293 This command is intended for styles where you write a comment per line,
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2294 starting a new comment (and terminating it if necessary) on each line.
10422
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
2295 If you want to continue one comment across several lines, use \\[newline-and-indent].
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
2296
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
2297 The inserted newline is marked hard if `use-hard-newlines' is true,
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
2298 unless optional argument SOFT is non-nil."
3c447e2caef3 (open-line, split-line, next-line): Use `newline'
Richard M. Stallman <rms@gnu.org>
parents: 10352
diff changeset
2299 (interactive)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2300 (let (comcol comstart)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2301 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2302 (delete-region (point)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2303 (progn (skip-chars-forward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2304 (point)))
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2305 (if soft (insert-and-inherit ?\n) (newline 1))
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2306 (if (not comment-multi-line)
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2307 (save-excursion
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2308 (if (and comment-start-skip
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2309 (let ((opoint (point)))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2310 (forward-line -1)
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2311 (re-search-forward comment-start-skip opoint t)))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2312 ;; The old line is a comment.
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2313 ;; Set WIN to the pos of the comment-start.
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2314 ;; But if the comment is empty, look at preceding lines
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2315 ;; to find one that has a nonempty comment.
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2316 (let ((win (match-beginning 0)))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2317 (while (and (eolp) (not (bobp))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2318 (let (opoint)
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2319 (beginning-of-line)
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2320 (setq opoint (point))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2321 (forward-line -1)
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2322 (re-search-forward comment-start-skip opoint t)))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2323 (setq win (match-beginning 0)))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2324 ;; Indent this line like what we found.
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2325 (goto-char win)
10597
b357342180c2 (indent-new-comment-line): Obey the convention
Richard M. Stallman <rms@gnu.org>
parents: 10525
diff changeset
2326 ;; If comment-start-skip contains a \(...\) pair,
b357342180c2 (indent-new-comment-line): Obey the convention
Richard M. Stallman <rms@gnu.org>
parents: 10525
diff changeset
2327 ;; the real comment delimiter starts at the end of that pair.
b357342180c2 (indent-new-comment-line): Obey the convention
Richard M. Stallman <rms@gnu.org>
parents: 10525
diff changeset
2328 (if (match-end 1)
b357342180c2 (indent-new-comment-line): Obey the convention
Richard M. Stallman <rms@gnu.org>
parents: 10525
diff changeset
2329 (goto-char (match-end 1)))
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2330 (setq comcol (current-column))
10597
b357342180c2 (indent-new-comment-line): Obey the convention
Richard M. Stallman <rms@gnu.org>
parents: 10525
diff changeset
2331 (setq comstart
b357342180c2 (indent-new-comment-line): Obey the convention
Richard M. Stallman <rms@gnu.org>
parents: 10525
diff changeset
2332 (buffer-substring (point) (match-end 0)))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2333 (if comcol
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2334 (let ((comment-column comcol)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2335 (comment-start comstart)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2336 (comment-end comment-end))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2337 (and comment-end (not (equal comment-end ""))
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2338 ; (if (not comment-multi-line)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2339 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2340 (forward-char -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2341 (insert comment-end)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2342 (forward-char 1))
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2343 ; (setq comment-column (+ comment-column (length comment-start))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2344 ; comment-start "")
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2345 ; )
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2346 )
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2347 (if (not (eolp))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2348 (setq comment-end ""))
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2349 (insert-and-inherit ?\n)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2350 (forward-char -1)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2351 (indent-for-comment)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2352 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2353 ;; Make sure we delete the newline inserted above.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2354 (end-of-line)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2355 (delete-char 1)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2356 (if fill-prefix
10469
2546bad34200 (do-auto-fill): Fill, don't fill, or fill-and-justify
Richard M. Stallman <rms@gnu.org>
parents: 10422
diff changeset
2357 (insert-and-inherit fill-prefix)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2358 (indent-according-to-mode)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2359
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2360 (defun set-selective-display (arg)
1027
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2361 "Set `selective-display' to ARG; clear it if no arg.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2362 When the value of `selective-display' is a number > 0,
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2363 lines whose indentation is >= that value are not displayed.
f0000f6f7942 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 954
diff changeset
2364 The variable `selective-display' has a separate value for each buffer."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2365 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2366 (if (eq selective-display t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2367 (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
2368 (let ((current-vpos
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2369 (save-restriction
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2370 (narrow-to-region (point-min) (point))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2371 (goto-char (window-start))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2372 (vertical-motion (window-height)))))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2373 (setq selective-display
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2374 (and arg (prefix-numeric-value arg)))
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2375 (recenter current-vpos))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2376 (set-window-start (selected-window) (window-start (selected-window)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2377 (princ "selective-display set to " t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2378 (prin1 selective-display t)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2379 (princ "." t))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2380
2215
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
2381 (defconst overwrite-mode-textual " Ovwrt"
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
2382 "The string displayed in the mode line when in overwrite mode.")
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
2383 (defconst overwrite-mode-binary " Bin Ovwrt"
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
2384 "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
2385
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2386 (defun overwrite-mode (arg)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2387 "Toggle overwrite mode.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2388 With arg, turn overwrite mode on iff arg is positive.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2389 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
2390 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
2391 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
2392 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
2393 \\[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
2394 is supposed to make it easier to insert characters when necessary."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2395 (interactive "P")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2396 (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
2397 (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
2398 (> (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
2399 '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
2400 (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
2401
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
2402 (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
2403 "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
2404 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
2405 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
2406 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
2407 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
2408 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
2409 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
2410 \\[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
2411 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
2412
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
2413 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
2414 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
2415 `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
2416 (interactive "P")
a7d915ce7676 src/ * simple.el (quoted-insert): In overwrite mode, don't read digits
Jim Blandy <jimb@redhat.com>
parents: 2111
diff changeset
2417 (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
2418 (if (if (null arg)
2301
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2419 (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
2420 (> (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
2421 '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
2422 (force-mode-line-update))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2423
2301
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2424 (defvar line-number-mode nil
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2425 "*Non-nil means display line number in mode line.")
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2426
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2427 (defun line-number-mode (arg)
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2428 "Toggle Line Number mode.
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2429 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
2430 When Line Number mode is enabled, the line number appears
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2431 in the mode line."
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2432 (interactive "P")
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2433 (setq line-number-mode
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2434 (if (null arg) (not line-number-mode)
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2435 (> (prefix-numeric-value arg) 0)))
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2436 (force-mode-line-update))
1380ea427dee (line-number-mode): New function and variable.
Richard M. Stallman <rms@gnu.org>
parents: 2299
diff changeset
2437
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2438 (defvar blink-matching-paren t
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2439 "*Non-nil means show matching open-paren when close-paren is inserted.")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2440
2669
0931cd677ff4 (blink-matching-paren-distance): Change default to 12,000.
Richard M. Stallman <rms@gnu.org>
parents: 2608
diff changeset
2441 (defconst blink-matching-paren-distance 12000
0931cd677ff4 (blink-matching-paren-distance): Change default to 12,000.
Richard M. Stallman <rms@gnu.org>
parents: 2608
diff changeset
2442 "*If non-nil, is maximum distance to search for matching open-paren.")
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2443
9771
3a51735d4a55 (blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9750
diff changeset
2444 (defconst blink-matching-delay 1
3a51735d4a55 (blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9750
diff changeset
2445 "*The number of seconds that `blink-matching-open' will delay at a match.")
3a51735d4a55 (blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9750
diff changeset
2446
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2447 (defun blink-matching-open ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2448 "Move cursor momentarily to the beginning of the sexp before point."
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2449 (interactive)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2450 (and (> (point) (1+ (point-min)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2451 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
2452 ;; 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
2453 (= 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
2454 (save-excursion
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
2455 (forward-char -1)
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
2456 (skip-syntax-backward "/\\")
b2157de450ca (blink-matching-open): Do blink if an even number of
Richard M. Stallman <rms@gnu.org>
parents: 9629
diff changeset
2457 (point)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2458 (let* ((oldpos (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2459 (blinkpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2460 (mismatch))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2461 (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2462 (save-restriction
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2463 (if blink-matching-paren-distance
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2464 (narrow-to-region (max (point-min)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2465 (- (point) blink-matching-paren-distance))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2466 oldpos))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2467 (condition-case ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2468 (setq blinkpos (scan-sexps oldpos -1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2469 (error nil)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2470 (and blinkpos (/= (char-syntax (char-after blinkpos))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2471 ?\$)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2472 (setq mismatch
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2473 (/= (char-after (1- oldpos))
8006
6e58b282df42 (scroll-other-window-down): New command.
Richard M. Stallman <rms@gnu.org>
parents: 7881
diff changeset
2474 (matching-paren (char-after blinkpos)))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2475 (if mismatch (setq blinkpos nil))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2476 (if blinkpos
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2477 (progn
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2478 (goto-char blinkpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2479 (if (pos-visible-in-window-p)
9771
3a51735d4a55 (blink-matching-delay): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 9750
diff changeset
2480 (sit-for blink-matching-delay)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2481 (goto-char blinkpos)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2482 (message
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2483 "Matches %s"
6539
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
2484 ;; Show what precedes the open in its line, if anything.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2485 (if (save-excursion
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2486 (skip-chars-backward " \t")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2487 (not (bolp)))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2488 (buffer-substring (progn (beginning-of-line) (point))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2489 (1+ blinkpos))
6539
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
2490 ;; 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
2491 (if (save-excursion
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
2492 (forward-char 1)
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
2493 (skip-chars-forward " \t")
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
2494 (not (eolp)))
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
2495 (buffer-substring blinkpos
b705afc2b2ec (blink-matching-open): Now three strategies for choosing
Richard M. Stallman <rms@gnu.org>
parents: 6386
diff changeset
2496 (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
2497 ;; 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
2498 ;; if there is one.
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2499 (if (save-excursion
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2500 (skip-chars-backward "\n \t")
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2501 (not (bobp)))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2502 (concat
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2503 (buffer-substring (progn
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2504 (skip-chars-backward "\n \t")
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2505 (beginning-of-line)
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2506 (point))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2507 (progn (end-of-line)
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2508 (skip-chars-backward " \t")
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2509 (point)))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2510 ;; 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
2511 "..."
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2512 (buffer-substring blinkpos (1+ blinkpos)))
d79ecfc2776c (blink-matching-open): Check there is a previous
Richard M. Stallman <rms@gnu.org>
parents: 9343
diff changeset
2513 ;; 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
2514 (buffer-substring blinkpos (1+ blinkpos))))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2515 (cond (mismatch
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2516 (message "Mismatched parentheses"))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2517 ((not blink-matching-paren-distance)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2518 (message "Unmatched parenthesis"))))))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2519
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2520 ;Turned off because it makes dbx bomb out.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2521 (setq blink-paren-function 'blink-matching-open)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2522
2805
5efa58250e35 (push-mark): Don't activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2796
diff changeset
2523 ;; 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
2524 ;; 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
2525 ;; that happens in the QUIT macro at the C code level.
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2526 (defun keyboard-quit ()
2075
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
2527 "Signal a quit condition.
ec62da254d4d (set-mark): Activate the mark.
Richard M. Stallman <rms@gnu.org>
parents: 2023
diff changeset
2528 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
2529 At top-level, as an editor command, this simply beeps."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2530 (interactive)
4042
4b4ab64225f7 (deactivate-mark): New function.
Roland McGrath <roland@gnu.org>
parents: 4040
diff changeset
2531 (deactivate-mark)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2532 (signal 'quit nil))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2533
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2534 (define-key global-map "\C-g" 'keyboard-quit)
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2535
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2536 (defvar buffer-quit-function nil
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2537 "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
2538 \\[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
2539 \(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
2540
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2541 (defun keyboard-escape-quit ()
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2542 "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
2543 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
2544 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
2545 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
2546 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
2547 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
2548 (interactive)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2549 (cond ((eq last-command 'mode-exited) nil)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2550 ((> (minibuffer-depth) 0)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2551 (abort-recursive-edit))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2552 (current-prefix-arg
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2553 nil)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2554 ((and transient-mark-mode
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2555 mark-active)
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2556 (deactivate-mark))
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2557 (buffer-quit-function
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2558 (funcall buffer-quit-function))
10085
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2559 ((not (one-window-p t))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2560 (delete-other-windows))))
f7b9813ea757 (keyboard-escape-quit): New command.
Richard M. Stallman <rms@gnu.org>
parents: 10048
diff changeset
2561
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2562 (define-key global-map "\e\e\e" 'keyboard-escape-quit)
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2563
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2564 (defun set-variable (var val)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2565 "Set VARIABLE to VALUE. VALUE is a Lisp object.
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2566 When using this interactively, supply a Lisp expression for VALUE.
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
2567 If you want VALUE to be a string, you must surround it with doublequotes.
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
2568
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
2569 If VARIABLE has a `variable-interactive' property, that is used as if
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
2570 it were the arg to `interactive' (which see) to interactively read the value."
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2571 (interactive
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2572 (let* ((var (read-variable "Set variable: "))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2573 (minibuffer-help-form
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2574 '(funcall myhelp))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2575 (myhelp
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2576 (function
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2577 (lambda ()
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2578 (with-output-to-temp-buffer "*Help*"
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2579 (prin1 var)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2580 (princ "\nDocumentation:\n")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2581 (princ (substring (documentation-property var 'variable-documentation)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2582 1))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2583 (if (boundp var)
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2584 (let ((print-length 20))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2585 (princ "\n\nCurrent value: ")
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2586 (prin1 (symbol-value var))))
9846
6a9a8abb0b6e (set-variable): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents: 9779
diff changeset
2587 (save-excursion
6a9a8abb0b6e (set-variable): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents: 9779
diff changeset
2588 (set-buffer standard-output)
6a9a8abb0b6e (set-variable): Set help-mode in *Help* buffer.
Karl Heuer <kwzh@gnu.org>
parents: 9779
diff changeset
2589 (help-mode))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2590 nil)))))
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2591 (list var
846
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
2592 (let ((prop (get var 'variable-interactive)))
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
2593 (if prop
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
2594 ;; Use VAR's `variable-interactive' property
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
2595 ;; as an interactive spec for prompting.
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
2596 (call-interactively (list 'lambda '(arg)
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
2597 (list 'interactive prop)
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
2598 'arg))
20674ae6bf52 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 762
diff changeset
2599 (eval-minibuffer (format "Set %s to value: " var)))))))
475
fb215f87f4a9 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2600 (set var val))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
2601
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
2602 ;; Define the major mode for lists of completions.
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2603
4217
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
2604 (defvar completion-list-mode-map nil)
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
2605 (or completion-list-mode-map
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
2606 (let ((map (make-sparse-keymap)))
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
2607 (define-key map [mouse-2] 'mouse-choose-completion)
7762
763a8b8e7363 (completion-list-mode-map): Unbind down-mouse-2.
Richard M. Stallman <rms@gnu.org>
parents: 7726
diff changeset
2608 (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
2609 (define-key map "\C-m" 'choose-completion)
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2610 (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
2611 (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
2612 (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
2613 (setq completion-list-mode-map map)))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
2614
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
2615 ;; 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
2616 (put 'completion-list-mode 'mode-class 'special)
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
2617
6160
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
2618 ;; Record the buffer that was current when the completion list was requested.
10252
85ae09b49021 (completion-reference-buffer): Initialize to nil.
Richard M. Stallman <rms@gnu.org>
parents: 10226
diff changeset
2619 ;; Initial value is nil to avoid some compiler warnings.
85ae09b49021 (completion-reference-buffer): Initialize to nil.
Richard M. Stallman <rms@gnu.org>
parents: 10226
diff changeset
2620 (defvar completion-reference-buffer nil)
6160
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
2621
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
2622 ;; This records the length of the text at the beginning of the buffer
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
2623 ;; which was not included in the completion.
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
2624 (defvar completion-base-size nil)
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
2625
10165
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2626 (defun delete-completion-window ()
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2627 "Delete the completion list window.
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2628 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
2629 (interactive)
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2630 (let ((buf completion-reference-buffer))
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2631 (delete-window (selected-window))
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2632 (if (get-buffer-window buf)
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2633 (select-window (get-buffer-window buf)))))
10a032873be6 (buffer-quit-function): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 10085
diff changeset
2634
10284
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2635 (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
2636 "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
2637 (interactive "p")
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2638 (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
2639
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2640 (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
2641 "Move to the next 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
2642 WIth prefix argument N, move N items (negative N means move backward)."
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2643 (interactive "p")
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2644 (while (and (> n 0) (not (eobp)))
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2645 (let ((prop (get-text-property (point) 'mouse-face)))
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2646 ;; If in a completion, move to the end of it.
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2647 (if prop
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2648 (goto-char (next-single-property-change (point) 'mouse-face)))
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2649 ;; Move to start of next one.
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2650 (goto-char (next-single-property-change (point) 'mouse-face)))
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2651 (setq n (1- n)))
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2652 (while (and (< n 0) (not (bobp)))
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2653 (let ((prop (get-text-property (1- (point)) 'mouse-face)))
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2654 ;; If in a completion, move to the start of it.
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2655 (if prop
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2656 (goto-char (previous-single-property-change (point) 'mouse-face)))
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2657 ;; Move to end of the previous completion.
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2658 (goto-char (previous-single-property-change (point) 'mouse-face))
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2659 ;; Move to the start of that one.
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2660 (goto-char (previous-single-property-change (point) 'mouse-face)))
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2661 (setq n (1+ n))))
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2662
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2663 (defun choose-completion ()
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2664 "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
2665 (interactive)
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
2666 (let (beg end completion (buffer completion-reference-buffer)
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
2667 (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
2668 (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
2669 (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
2670 (if (and (not (bobp)) (get-text-property (1- (point)) 'mouse-face))
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
2671 (setq end (1- (point)) beg(point)))
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
2672 (if (null beg)
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
2673 (error "No completion here"))
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
2674 (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
2675 (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
2676 (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
2677 (let ((owindow (selected-window)))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
2678 (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
2679 (window-dedicated-p (selected-window)))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
2680 ;; 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
2681 (iconify-frame (selected-frame))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
2682 (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
2683 (bury-buffer)))
52940ba43041 (choose-completion): Bury or iconify the completion list
Richard M. Stallman <rms@gnu.org>
parents: 8442
diff changeset
2684 (select-window owindow))
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
2685 (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
2686
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2687 ;; 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
2688 ;; that can be found before POINT.
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2689 (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
2690 (let ((opoint (point))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2691 (len (min (length string)
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2692 (- (point) (point-min)))))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2693 (goto-char (- (point) (length string)))
7574
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
2694 (if completion-ignore-case
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
2695 (setq string (downcase string)))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2696 (while (and (> len 0)
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2697 (let ((tail (buffer-substring (point)
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2698 (+ (point) len))))
7574
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
2699 (if completion-ignore-case
040547adfab2 (completion-setup-function): Make highlight span single spaces.
Richard M. Stallman <rms@gnu.org>
parents: 7463
diff changeset
2700 (setq tail (downcase tail)))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2701 (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
2702 (setq len (1- len))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2703 (forward-char 1))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2704 (delete-char len)))
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2705
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
2706 (defun choose-completion-string (choice &optional buffer base-size)
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2707 (let ((buffer (or buffer completion-reference-buffer)))
7333
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
2708 ;; 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
2709 ;; active minibuffer.
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
2710 (if (and (string-match "\\` \\*Minibuf-[0-9]+\\*\\'" (buffer-name buffer))
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
2711 (or (not (minibuffer-window-active-p (minibuffer-window)))
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
2712 (not (equal buffer (window-buffer (minibuffer-window))))))
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
2713 (error "Minibuffer is not active for completion")
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
2714 ;; Insert the completion into the buffer where completion was requested.
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
2715 (set-buffer buffer)
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
2716 (if base-size
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
2717 (delete-region (+ base-size (point-min)) (point))
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
2718 (choose-completion-delete-max-match choice))
7333
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
2719 (insert choice)
7697
b52a92ea3796 (choose-completion-string): Clear mouse-face property.
Richard M. Stallman <rms@gnu.org>
parents: 7594
diff changeset
2720 (remove-text-properties (- (point) (length choice)) (point)
b52a92ea3796 (choose-completion-string): Clear mouse-face property.
Richard M. Stallman <rms@gnu.org>
parents: 7594
diff changeset
2721 '(mouse-face nil))
7333
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
2722 ;; Update point in the window that BUFFER is showing in.
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
2723 (let ((window (get-buffer-window buffer t)))
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
2724 (set-window-point window (point)))
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
2725 ;; If completing for the minibuffer, exit it with this choice.
7a0395228878 (choose-completion-string): Barf if completing into
Richard M. Stallman <rms@gnu.org>
parents: 7076
diff changeset
2726 (and (equal buffer (window-buffer (minibuffer-window)))
8559
509daefd2d13 (choose-completion-string): Use plain exit-minibuffer,
Richard M. Stallman <rms@gnu.org>
parents: 8479
diff changeset
2727 minibuffer-completion-table
509daefd2d13 (choose-completion-string): Use plain exit-minibuffer,
Richard M. Stallman <rms@gnu.org>
parents: 8479
diff changeset
2728 (exit-minibuffer)))))
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2729
4217
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
2730 (defun completion-list-mode ()
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
2731 "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
2732 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
2733 to select the completion near point.
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2734 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
2735 with the mouse."
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
2736 (interactive)
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
2737 (kill-all-local-variables)
4217
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
2738 (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
2739 (setq mode-name "Completion List")
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
2740 (setq major-mode 'completion-list-mode)
8479
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
2741 (make-local-variable 'completion-base-size)
582ac9a744c4 (completion-base-size): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8468
diff changeset
2742 (setq completion-base-size nil)
4217
997e8a52f9fd (completion-list-mode): Renamed from completion-mode.
Richard M. Stallman <rms@gnu.org>
parents: 4103
diff changeset
2743 (run-hooks 'completion-list-mode-hook))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
2744
8203
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
2745 (defvar completion-fixup-function nil)
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
2746
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
2747 (defun completion-setup-function ()
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
2748 (save-excursion
6160
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
2749 (let ((mainbuf (current-buffer)))
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
2750 (set-buffer standard-output)
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
2751 (completion-list-mode)
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
2752 (make-local-variable 'completion-reference-buffer)
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
2753 (setq completion-reference-buffer mainbuf)
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
2754 (goto-char (point-min))
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
2755 (if window-system
5a40bc311e2f (completion-list-mode): Set completion-reference-buffer
Richard M. Stallman <rms@gnu.org>
parents: 5944
diff changeset
2756 (insert (substitute-command-keys
6549
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2757 "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
2758 (insert (substitute-command-keys
d66e48956d3e (choose-completion-delete-max-match): Renamed from
Richard M. Stallman <rms@gnu.org>
parents: 6539
diff changeset
2759 "In this buffer, type \\[choose-completion] to \
6674
7ada27b4bf3c (completion-setup-function): Add mouse-face properties.
Karl Heuer <kwzh@gnu.org>
parents: 6549
diff changeset
2760 select the completion near point.\n\n"))
7ada27b4bf3c (completion-setup-function): Add mouse-face properties.
Karl Heuer <kwzh@gnu.org>
parents: 6549
diff changeset
2761 (forward-line 1)
8203
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
2762 (while (re-search-forward "[^ \t\n]+\\( [^ \t\n]+\\)*" nil t)
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
2763 (let ((beg (match-beginning 0))
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
2764 (end (point)))
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
2765 (if completion-fixup-function
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
2766 (funcall completion-fixup-function))
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
2767 (put-text-property beg (point) 'mouse-face 'highlight)
7f13bc5470d9 (completion-setup-function): Put on mouse-face prop
Richard M. Stallman <rms@gnu.org>
parents: 8080
diff changeset
2768 (goto-char end))))))
4082
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
2769
1d4aa358d9a0 (completion-mode): New major mode.
Richard M. Stallman <rms@gnu.org>
parents: 4044
diff changeset
2770 (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
2771
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2772 (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
2773 '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
2774 (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
2775 '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
2776 (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
2777 '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
2778 (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
2779 '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
2780
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2781 (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
2782 "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
2783 (interactive)
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2784 (select-window (get-buffer-window "*Completions*"))
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2785 (goto-char (point-min))
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2786 (search-forward "\n\n")
832491972c95 (switch-to-completions): New command, with bindings in minibuf completion maps.
Richard M. Stallman <rms@gnu.org>
parents: 10252
diff changeset
2787 (forward-line 1))
3947
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
2788
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
2789 ;;;; Keypad support.
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
2790
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
2791 ;;; 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
2792 ;;; 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
2793 ;;; 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
2794 ;;; bindings.
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
2795
5342
f38861038093 (setting up kp-... keys): Make ascii-character props.
Richard M. Stallman <rms@gnu.org>
parents: 5324
diff changeset
2796 ;; Also tell read-char how to handle these keys.
3947
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
2797 (mapcar
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
2798 (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
2799 (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
2800 (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
2801 (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
2802 (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
2803 '((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
2804 (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
2805 (kp-space ?\ )
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
2806 (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
2807 (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
2808 (kp-multiply ?*)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
2809 (kp-add ?+)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
2810 (kp-separator ?,)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
2811 (kp-subtract ?-)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
2812 (kp-decimal ?.)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
2813 (kp-divide ?/)
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
2814 (kp-equal ?=)))
924d8515c250 * simple.el: Add bindings to function-key-map so that the keypad
Jim Blandy <jimb@redhat.com>
parents: 3936
diff changeset
2815
658
7cbd4fcd8b0f *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 617
diff changeset
2816 ;;; simple.el ends here