annotate lisp/rect.el @ 45079:bf76420e3297

(occur-mode-map): Bind "q" to `delete-window'. (occur-1): If one of the buffers we're searching is the *Occur* buffer itself, handle it by creating a temporary buffer. If any of the buffers being searched are killed, note that in the search result message. Also, set local variables before we possibly kill the buffer.
author Colin Walters <walters@gnu.org>
date Thu, 02 May 2002 21:22:47 +0000
parents 37fdab0b94fa
children 4f3c96288c84
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38436
b174db545cfd Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents: 37444
diff changeset
1 ;;; rect.el --- rectangle functions for GNU Emacs
659
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 258
diff changeset
2
37444
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
3 ;; Copyright (C) 1985, 1999, 2000, 2001 Free Software Foundation, Inc.
845
213978acbc1e entered into RCS
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 814
diff changeset
4
39537
133fc59b5c6a Update maintainer's email address.
Eli Zaretskii <eliz@gnu.org>
parents: 38436
diff changeset
5 ;; Maintainer: Didier Verna <didier@xemacs.org>
814
38b2499cb3e9 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 807
diff changeset
6 ;; Keywords: internal
789
71d052f72ac1 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 659
diff changeset
7
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
9
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
807
4f28bd14272c *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 789
diff changeset
12 ;; the Free Software Foundation; either version 2, or (at your option)
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
13 ;; any later version.
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
14
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
18 ;; GNU General Public License for more details.
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
19
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 9877
diff changeset
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 9877
diff changeset
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 9877
diff changeset
23 ;; Boston, MA 02111-1307, USA.
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
24
2308
f287613dfc28 Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 1619
diff changeset
25 ;;; Commentary:
f287613dfc28 Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 1619
diff changeset
26
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
27 ;; This package provides the operations on rectangles that are documented
2308
f287613dfc28 Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 1619
diff changeset
28 ;; in the Emacs manual.
f287613dfc28 Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 1619
diff changeset
29
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
30 ;; ### NOTE: this file has been almost completely rewritten by Didier Verna
39537
133fc59b5c6a Update maintainer's email address.
Eli Zaretskii <eliz@gnu.org>
parents: 38436
diff changeset
31 ;; <didier@xemacs.org> in July 1999. The purpose of this rewrite is to be less
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
32 ;; intrusive and fill lines with whitespaces only when needed. A few functions
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
33 ;; are untouched though, as noted above their definition.
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
34
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
35
789
71d052f72ac1 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 659
diff changeset
36 ;;; Code:
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
37
23757
717a33da04a1 (move-to-column-force): New function.
Kenichi Handa <handa@m17n.org>
parents: 23641
diff changeset
38 ;;;###autoload
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
39 (defun move-to-column-force (column &optional flag)
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
40 "Obsolete. Use `move-to-column'.
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
41 If COLUMN is within a multi-column character, replace it by spaces and tab.
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
42 As for `move-to-column', passing anything but nil or t in FLAG will move to
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
43 the desired column only if the line is long enough."
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
44 (move-to-column column (or flag t)))
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
45 (make-obsolete 'move-to-column-force "move-to-column" "21.2")
23757
717a33da04a1 (move-to-column-force): New function.
Kenichi Handa <handa@m17n.org>
parents: 23641
diff changeset
46
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
47 ;; not used any more --dv
22213
84c3c863f0bd (string-rectangle-string): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22205
diff changeset
48 ;; extract-rectangle-line stores lines into this list
84c3c863f0bd (string-rectangle-string): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22205
diff changeset
49 ;; to accumulate them for extract-rectangle and delete-extract-rectangle.
84c3c863f0bd (string-rectangle-string): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22205
diff changeset
50 (defvar operate-on-rectangle-lines)
84c3c863f0bd (string-rectangle-string): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22205
diff changeset
51
30283
70a7936c29c5 (open-rectangle-line): Remove unused let.
Dave Love <fx@gnu.org>
parents: 28078
diff changeset
52 ;; ### NOTE: this function is untouched, but not used anymore apart from
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
53 ;; `delete-whitespace-rectangle'. `apply-on-rectangle' is used instead. --dv
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
54 (defun operate-on-rectangle (function start end coerce-tabs)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
55 "Call FUNCTION for each line of rectangle with corners at START, END.
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
56 If COERCE-TABS is non-nil, convert multi-column characters
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
57 that span the starting or ending columns on any line
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
58 to multiple spaces before calling FUNCTION.
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
59 FUNCTION is called with three arguments:
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
60 position of start of segment of this line within the rectangle,
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
61 number of columns that belong to rectangle but are before that position,
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
62 number of columns that belong to rectangle but are after point.
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
63 Point is at the end of the segment of this line within the rectangle."
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
64 (let (startcol startlinepos endcol endlinepos)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
65 (save-excursion
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
66 (goto-char start)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
67 (setq startcol (current-column))
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
68 (beginning-of-line)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
69 (setq startlinepos (point)))
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
70 (save-excursion
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
71 (goto-char end)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
72 (setq endcol (current-column))
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
73 (forward-line 1)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
74 (setq endlinepos (point-marker)))
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
75 (if (< endcol startcol)
1619
6147d2164331 * rect.el (operate-on-rectangle): Use move-to-column's FORCE
Jim Blandy <jimb@redhat.com>
parents: 1542
diff changeset
76 (setq startcol (prog1 endcol (setq endcol startcol))))
5787
bef3a67ac893 (string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents: 2637
diff changeset
77 (save-excursion
bef3a67ac893 (string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents: 2637
diff changeset
78 (goto-char startlinepos)
bef3a67ac893 (string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents: 2637
diff changeset
79 (while (< (point) endlinepos)
bef3a67ac893 (string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents: 2637
diff changeset
80 (let (startpos begextra endextra)
23757
717a33da04a1 (move-to-column-force): New function.
Kenichi Handa <handa@m17n.org>
parents: 23641
diff changeset
81 (if coerce-tabs
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
82 (move-to-column startcol t)
23757
717a33da04a1 (move-to-column-force): New function.
Kenichi Handa <handa@m17n.org>
parents: 23641
diff changeset
83 (move-to-column startcol))
5787
bef3a67ac893 (string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents: 2637
diff changeset
84 (setq begextra (- (current-column) startcol))
bef3a67ac893 (string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents: 2637
diff changeset
85 (setq startpos (point))
23757
717a33da04a1 (move-to-column-force): New function.
Kenichi Handa <handa@m17n.org>
parents: 23641
diff changeset
86 (if coerce-tabs
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
87 (move-to-column endcol t)
23757
717a33da04a1 (move-to-column-force): New function.
Kenichi Handa <handa@m17n.org>
parents: 23641
diff changeset
88 (move-to-column endcol))
19732
d8478556c7f0 (operate-on-rectangle): If we overshoot when looking for endcol, back up.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
89 ;; If we overshot, move back one character
d8478556c7f0 (operate-on-rectangle): If we overshoot when looking for endcol, back up.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
90 ;; so that endextra will be positive.
d8478556c7f0 (operate-on-rectangle): If we overshoot when looking for endcol, back up.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
91 (if (and (not coerce-tabs) (> (current-column) endcol))
d8478556c7f0 (operate-on-rectangle): If we overshoot when looking for endcol, back up.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
92 (backward-char 1))
5787
bef3a67ac893 (string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents: 2637
diff changeset
93 (setq endextra (- endcol (current-column)))
bef3a67ac893 (string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents: 2637
diff changeset
94 (if (< begextra 0)
bef3a67ac893 (string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents: 2637
diff changeset
95 (setq endextra (+ endextra begextra)
bef3a67ac893 (string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents: 2637
diff changeset
96 begextra 0))
bef3a67ac893 (string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents: 2637
diff changeset
97 (funcall function startpos begextra endextra))
bef3a67ac893 (string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents: 2637
diff changeset
98 (forward-line 1)))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
99 (- endcol startcol)))
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
100
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
101 ;; The replacement for `operate-on-rectangle' -- dv
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
102 (defun apply-on-rectangle (function start end &rest args)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
103 "Call FUNCTION for each line of rectangle with corners at START, END.
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
104 FUNCTION is called with two arguments: the start and end columns of the
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
105 rectangle, plus ARGS extra arguments. Point is at the beginning of line when
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
106 the function is called."
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
107 (let (startcol startpt endcol endpt)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
108 (save-excursion
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
109 (goto-char start)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
110 (setq startcol (current-column))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
111 (beginning-of-line)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
112 (setq startpt (point))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
113 (goto-char end)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
114 (setq endcol (current-column))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
115 (forward-line 1)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
116 (setq endpt (point-marker))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
117 ;; ensure the start column is the left one.
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
118 (if (< endcol startcol)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
119 (let ((col startcol))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
120 (setq startcol endcol endcol col)))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
121 ;; start looping over lines
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
122 (goto-char startpt)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
123 (while (< (point) endpt)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
124 (apply function startcol endcol args)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
125 (forward-line 1)))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
126 ))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
127
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
128 (defun delete-rectangle-line (startcol endcol fill)
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
129 (when (= (move-to-column startcol (or fill 'coerce)) startcol)
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
130 (delete-region (point)
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
131 (progn (move-to-column endcol 'coerce)
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
132 (point)))))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
133
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
134 (defun delete-extract-rectangle-line (startcol endcol lines fill)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
135 (let ((pt (point-at-eol)))
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
136 (if (< (move-to-column startcol (or fill 'coerce)) startcol)
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
137 (setcdr lines (cons (spaces-string (- endcol startcol))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
138 (cdr lines)))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
139 ;; else
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
140 (setq pt (point))
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
141 (move-to-column endcol t)
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
142 (setcdr lines (cons (buffer-substring pt (point)) (cdr lines)))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
143 (delete-region pt (point)))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
144 ))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
145
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
146 ;; ### NOTE: this is actually the only function that needs to do complicated
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
147 ;; stuff like what's happening in `operate-on-rectangle', because the buffer
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
148 ;; might be read-only. --dv
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
149 (defun extract-rectangle-line (startcol endcol lines)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
150 (let (start end begextra endextra line)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
151 (move-to-column startcol)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
152 (setq start (point)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
153 begextra (- (current-column) startcol))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
154 (move-to-column endcol)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
155 (setq end (point)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
156 endextra (- endcol (current-column)))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
157 (setq line (buffer-substring start (point)))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
158 (if (< begextra 0)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
159 (setq endextra (+ endextra begextra)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
160 begextra 0))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
161 (if (< endextra 0)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
162 (setq endextra 0))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
163 (goto-char start)
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
164 (while (search-forward "\t" end t)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
165 (let ((width (- (current-column)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
166 (save-excursion (forward-char -1)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
167 (current-column)))))
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
168 (setq line (concat (substring line 0 (- (point) end 1))
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
169 (spaces-string width)
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
170 (substring line (+ (length line)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
171 (- (point) end)))))))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
172 (if (or (> begextra 0) (> endextra 0))
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
173 (setq line (concat (spaces-string begextra)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
174 line
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
175 (spaces-string endextra))))
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
176 (setcdr lines (cons line (cdr lines)))))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
177
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
178 (defconst spaces-strings
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
179 '["" " " " " " " " " " " " " " " " "])
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
180
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
181 ;; this one is untouched --dv
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
182 (defun spaces-string (n)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
183 (if (<= n 8) (aref spaces-strings n)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
184 (let ((val ""))
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
185 (while (> n 8)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
186 (setq val (concat " " val)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
187 n (- n 8)))
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
188 (concat val (aref spaces-strings n)))))
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
189
258
1e0bc00dca7a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 242
diff changeset
190 ;;;###autoload
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
191 (defun delete-rectangle (start end &optional fill)
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
192 "Delete (don't save) text in the region-rectangle.
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
193 The same range of columns is deleted in each line starting with the
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
194 line where the region begins and ending with the line where the region
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
195 ends.
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
196
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
197 When called from a program the rectangle's corners are START and END.
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
198 With a prefix (or a FILL) argument, also fill lines where nothing has
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
199 to be deleted."
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
200 (interactive "*r\nP")
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
201 (apply-on-rectangle 'delete-rectangle-line start end fill))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
202
258
1e0bc00dca7a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 242
diff changeset
203 ;;;###autoload
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
204 (defun delete-extract-rectangle (start end &optional fill)
25380
b5ef1f54a2ca (delete-extract-rectangle): Doc fix from verna.
Dave Love <fx@gnu.org>
parents: 25379
diff changeset
205 "Delete the contents of the rectangle with corners at START and END.
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
206 Return it as a list of strings, one for each line of the rectangle.
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
207
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
208 When called from a program the rectangle's corners are START and END.
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
209 With an optional FILL argument, also fill lines where nothing has to be
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
210 deleted."
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
211 (let ((lines (list nil)))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
212 (apply-on-rectangle 'delete-extract-rectangle-line start end lines fill)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
213 (nreverse (cdr lines))))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
214
258
1e0bc00dca7a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 242
diff changeset
215 ;;;###autoload
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
216 (defun extract-rectangle (start end)
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
217 "Return the contents of the rectangle with corners at START and END.
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
218 Return it as a list of strings, one for each line of the rectangle."
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
219 (let ((lines (list nil)))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
220 (apply-on-rectangle 'extract-rectangle-line start end lines)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
221 (nreverse (cdr lines))))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
222
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
223 (defvar killed-rectangle nil
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
224 "Rectangle for `yank-rectangle' to insert.")
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
225
258
1e0bc00dca7a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 242
diff changeset
226 ;;;###autoload
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
227 (defun kill-rectangle (start end &optional fill)
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
228 "Delete the region-rectangle and save it as the last killed one.
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
229
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
230 When called from a program the rectangle's corners are START and END.
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
231 You might prefer to use `delete-extract-rectangle' from a program.
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
232
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
233 With a prefix (or a FILL) argument, also fill lines where nothing has to be
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
234 deleted."
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
235 (interactive "*r\nP")
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
236 (when buffer-read-only
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
237 (setq killed-rectangle (extract-rectangle start end))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
238 (barf-if-buffer-read-only))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
239 (setq killed-rectangle (delete-extract-rectangle start end fill)))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
240
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
241 ;; this one is untouched --dv
258
1e0bc00dca7a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 242
diff changeset
242 ;;;###autoload
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
243 (defun yank-rectangle ()
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
244 "Yank the last killed rectangle with upper left corner at point."
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
245 (interactive "*")
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
246 (insert-rectangle killed-rectangle))
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
247
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
248 ;; this one is untoutched --dv
258
1e0bc00dca7a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 242
diff changeset
249 ;;;###autoload
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
250 (defun insert-rectangle (rectangle)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
251 "Insert text of RECTANGLE with upper left corner at point.
242
5647f2040009 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 36
diff changeset
252 RECTANGLE's first line is inserted at point, its second
5647f2040009 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 36
diff changeset
253 line is inserted at a point vertically under point, etc.
1542
724b443e445d (insert-rectangle): Put mark at upper left corner.
Richard M. Stallman <rms@gnu.org>
parents: 845
diff changeset
254 RECTANGLE should be a list of strings.
724b443e445d (insert-rectangle): Put mark at upper left corner.
Richard M. Stallman <rms@gnu.org>
parents: 845
diff changeset
255 After this command, the mark is at the upper left corner
724b443e445d (insert-rectangle): Put mark at upper left corner.
Richard M. Stallman <rms@gnu.org>
parents: 845
diff changeset
256 and point is at the lower right corner."
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
257 (let ((lines rectangle)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
258 (insertcolumn (current-column))
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
259 (first t))
1542
724b443e445d (insert-rectangle): Put mark at upper left corner.
Richard M. Stallman <rms@gnu.org>
parents: 845
diff changeset
260 (push-mark)
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
261 (while lines
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
262 (or first
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
263 (progn
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
264 (forward-line 1)
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
265 (or (bolp) (insert ?\n))
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
266 (move-to-column insertcolumn t)))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
267 (setq first nil)
44676
37fdab0b94fa (insert-rectangle): Use insert-for-yank.
Richard M. Stallman <rms@gnu.org>
parents: 44207
diff changeset
268 (insert-for-yank (car lines))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
269 (setq lines (cdr lines)))))
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
270
258
1e0bc00dca7a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 242
diff changeset
271 ;;;###autoload
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
272 (defun open-rectangle (start end &optional fill)
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
273 "Blank out the region-rectangle, shifting text right.
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
274
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
275 The text previously in the region is not overwritten by the blanks,
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
276 but instead winds up to the right of the rectangle.
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
277
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
278 When called from a program the rectangle's corners are START and END.
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
279 With a prefix (or a FILL) argument, fill with blanks even if there is no text
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
280 on the right side of the rectangle."
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
281 (interactive "*r\nP")
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
282 (apply-on-rectangle 'open-rectangle-line start end fill)
1619
6147d2164331 * rect.el (operate-on-rectangle): Use move-to-column's FORCE
Jim Blandy <jimb@redhat.com>
parents: 1542
diff changeset
283 (goto-char start))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
284
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
285 (defun open-rectangle-line (startcol endcol fill)
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
286 (when (= (move-to-column startcol (or fill 'coerce)) startcol)
30283
70a7936c29c5 (open-rectangle-line): Remove unused let.
Dave Love <fx@gnu.org>
parents: 28078
diff changeset
287 (unless (and (not fill)
70a7936c29c5 (open-rectangle-line): Remove unused let.
Dave Love <fx@gnu.org>
parents: 28078
diff changeset
288 (= (point) (point-at-eol)))
70a7936c29c5 (open-rectangle-line): Remove unused let.
Dave Love <fx@gnu.org>
parents: 28078
diff changeset
289 (indent-to endcol))))
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
290
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
291 (defun delete-whitespace-rectangle-line (startcol endcol fill)
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
292 (when (= (move-to-column startcol (or fill 'coerce)) startcol)
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
293 (unless (= (point) (point-at-eol))
37444
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
294 (delete-region (point) (progn (skip-syntax-forward " ") (point))))))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
295
23812
baf00f643ccf (delete-whitespace-rectangle): Mark for autoload.
Andreas Schwab <schwab@suse.de>
parents: 23757
diff changeset
296 ;;;###autoload (defalias 'close-rectangle 'delete-whitespace-rectangle) ;; Old name
258
1e0bc00dca7a *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 242
diff changeset
297 ;;;###autoload
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
298 (defun delete-whitespace-rectangle (start end &optional fill)
22205
8576d32229fc (close-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 19732
diff changeset
299 "Delete all whitespace following a specified column in each line.
8576d32229fc (close-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 19732
diff changeset
300 The left edge of the rectangle specifies the position in each line
8576d32229fc (close-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 19732
diff changeset
301 at which whitespace deletion should begin. On each line in the
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
302 rectangle, all continuous whitespace starting at that column is deleted.
22205
8576d32229fc (close-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 19732
diff changeset
303
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
304 When called from a program the rectangle's corners are START and END.
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
305 With a prefix (or a FILL) argument, also fill too short lines."
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
306 (interactive "*r\nP")
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
307 (apply-on-rectangle 'delete-whitespace-rectangle-line start end fill))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
308
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
309 ;; not used any more --dv
22213
84c3c863f0bd (string-rectangle-string): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22205
diff changeset
310 ;; string-rectangle uses this variable to pass the string
84c3c863f0bd (string-rectangle-string): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22205
diff changeset
311 ;; to string-rectangle-line.
84c3c863f0bd (string-rectangle-string): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 22205
diff changeset
312 (defvar string-rectangle-string)
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
313 (defvar string-rectangle-history nil)
33772
4787f33fe54f (string-rectangle): Revert last change.
Dave Love <fx@gnu.org>
parents: 33750
diff changeset
314 (defun string-rectangle-line (startcol endcol string delete)
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
315 (move-to-column startcol t)
33772
4787f33fe54f (string-rectangle): Revert last change.
Dave Love <fx@gnu.org>
parents: 33750
diff changeset
316 (if delete
4787f33fe54f (string-rectangle): Revert last change.
Dave Love <fx@gnu.org>
parents: 33750
diff changeset
317 (delete-rectangle-line startcol endcol nil))
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
318 (insert string))
2380
e67f6d2679e3 (fill-rectangle) Added. Inspired by Lynn Slater's insert-box package in LCD,
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2308
diff changeset
319
e67f6d2679e3 (fill-rectangle) Added. Inspired by Lynn Slater's insert-box package in LCD,
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2308
diff changeset
320 ;;;###autoload
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
321
37444
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
322 (defun string-rectangle (start end string)
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
323 "Replace rectangle contents with STRING on each line.
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
324 The length of STRING need not be the same as the rectangle width.
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
325
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
326 Called from a program, takes three args; START, END and STRING."
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
327 (interactive
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
328 (progn (barf-if-buffer-read-only)
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
329 (list
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
330 (region-beginning)
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
331 (region-end)
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
332 (read-string (format "String rectangle (default `%s'): "
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
333 (or (car string-rectangle-history) ""))
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
334 nil 'string-rectangle-history
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
335 (car string-rectangle-history)))))
33772
4787f33fe54f (string-rectangle): Revert last change.
Dave Love <fx@gnu.org>
parents: 33750
diff changeset
336 (apply-on-rectangle 'string-rectangle-line start end string t))
28078
99865d22cc31 2000-09-01 Didier Verna <didier@xemacs.org>
Dave Love <fx@gnu.org>
parents: 25380
diff changeset
337
44207
6c55bf040a71 (replace-rectangle): Add autoload.
Richard M. Stallman <rms@gnu.org>
parents: 43555
diff changeset
338 ;;;###autoload
37444
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
339 (defalias 'replace-rectangle 'string-rectangle)
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
340
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
341 ;;;###autoload
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
342 (defun string-insert-rectangle (start end string)
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
343 "Insert STRING on each line of region-rectangle, shifting text right.
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
344
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
345 When called from a program, the rectangle's corners are START and END.
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
346 The left edge of the rectangle specifies the column for insertion.
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
347 This command does not delete or overwrite any existing text."
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
348 (interactive
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
349 (progn (barf-if-buffer-read-only)
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
350 (list
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
351 (region-beginning)
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
352 (region-end)
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
353 (read-string (format "String insert rectangle (default `%s'): "
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
354 (or (car string-rectangle-history) ""))
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
355 nil 'string-rectangle-history
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
356 (car string-rectangle-history)))))
37444
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
357 (apply-on-rectangle 'string-rectangle-line start end string nil))
d5ed9aa37aa2 (string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents: 33807
diff changeset
358
28078
99865d22cc31 2000-09-01 Didier Verna <didier@xemacs.org>
Dave Love <fx@gnu.org>
parents: 25380
diff changeset
359 ;;;###autoload
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
360 (defun clear-rectangle (start end &optional fill)
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
361 "Blank out the region-rectangle.
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
362 The text previously in the region is overwritten with blanks.
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
363
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
364 When called from a program the rectangle's corners are START and END.
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
365 With a prefix (or a FILL) argument, also fill with blanks the parts of the
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
366 rectangle which were empty."
25379
167c69238538 Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents: 25291
diff changeset
367 (interactive "*r\nP")
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
368 (apply-on-rectangle 'clear-rectangle-line start end fill))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
369
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
370 (defun clear-rectangle-line (startcol endcol fill)
43555
c33c91ae60fc (clear-rectangle-line): Reindent to the same column
Richard M. Stallman <rms@gnu.org>
parents: 41173
diff changeset
371 (let ((pt (point-at-eol)))
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
372 (when (= (move-to-column startcol (or fill 'coerce)) startcol)
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
373 (if (and (not fill)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
374 (<= (save-excursion (goto-char pt) (current-column)) endcol))
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
375 (delete-region (point) pt)
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
376 ;; else
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
377 (setq pt (point))
41173
e1285c5daeaf (move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39537
diff changeset
378 (move-to-column endcol t)
43555
c33c91ae60fc (clear-rectangle-line): Reindent to the same column
Richard M. Stallman <rms@gnu.org>
parents: 41173
diff changeset
379 (setq endcol (current-column))
25168
0fbd51325497 All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents: 23812
diff changeset
380 (delete-region pt (point))
43555
c33c91ae60fc (clear-rectangle-line): Reindent to the same column
Richard M. Stallman <rms@gnu.org>
parents: 41173
diff changeset
381 (indent-to endcol)))))
36
9697c13298e5 Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
382
1619
6147d2164331 * rect.el (operate-on-rectangle): Use move-to-column's FORCE
Jim Blandy <jimb@redhat.com>
parents: 1542
diff changeset
383 (provide 'rect)
659
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 258
diff changeset
384
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 258
diff changeset
385 ;;; rect.el ends here