annotate lisp/simple.el @ 8057:11a0c2f22d7e

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