Mercurial > emacs
annotate lisp/rect.el @ 59974:bb6a99f86b5d
* xfns.c (Fx_backspace_delete_keys_p): Added comment about the
reason for the approach in the code.
author | Jan Djärv <jan.h.d@swipnet.se> |
---|---|
date | Mon, 07 Feb 2005 12:50:38 +0000 |
parents | b2ab001718c6 |
children | 6fb026ad601f fa9654493afb |
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 | 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 | 8 ;; This file is part of GNU Emacs. |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
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 | 13 ;; any later version. |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
14169 | 21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
23 ;; Boston, MA 02111-1307, USA. | |
36 | 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 | 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) |
46054
06ea4b707bb2
(move-to-column-force): Likewise.
Juanma Barranquero <lekktu@gmail.com>
parents:
45168
diff
changeset
|
40 "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
|
41 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
|
42 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
|
43 (move-to-column column (or flag t))) |
46512
8e08ec435afd
(move-to-column-force): Add autoload cookie to obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
46054
diff
changeset
|
44 |
8e08ec435afd
(move-to-column-force): Add autoload cookie to obsolescence declaration.
Juanma Barranquero <lekktu@gmail.com>
parents:
46054
diff
changeset
|
45 ;;;###autoload |
46054
06ea4b707bb2
(move-to-column-force): Likewise.
Juanma Barranquero <lekktu@gmail.com>
parents:
45168
diff
changeset
|
46 (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
|
47 |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
48 ;; not used any more --dv |
22213
84c3c863f0bd
(string-rectangle-string): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22205
diff
changeset
|
49 ;; extract-rectangle-line stores lines into this list |
84c3c863f0bd
(string-rectangle-string): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22205
diff
changeset
|
50 ;; 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
|
51 (defvar operate-on-rectangle-lines) |
84c3c863f0bd
(string-rectangle-string): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22205
diff
changeset
|
52 |
30283
70a7936c29c5
(open-rectangle-line): Remove unused let.
Dave Love <fx@gnu.org>
parents:
28078
diff
changeset
|
53 ;; ### 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
|
54 ;; `delete-whitespace-rectangle'. `apply-on-rectangle' is used instead. --dv |
36 | 55 (defun operate-on-rectangle (function start end coerce-tabs) |
56 "Call FUNCTION for each line of rectangle with corners at START, END. | |
57 If COERCE-TABS is non-nil, convert multi-column characters | |
58 that span the starting or ending columns on any line | |
59 to multiple spaces before calling FUNCTION. | |
60 FUNCTION is called with three arguments: | |
61 position of start of segment of this line within the rectangle, | |
62 number of columns that belong to rectangle but are before that position, | |
63 number of columns that belong to rectangle but are after point. | |
64 Point is at the end of the segment of this line within the rectangle." | |
65 (let (startcol startlinepos endcol endlinepos) | |
66 (save-excursion | |
67 (goto-char start) | |
68 (setq startcol (current-column)) | |
69 (beginning-of-line) | |
70 (setq startlinepos (point))) | |
71 (save-excursion | |
72 (goto-char end) | |
73 (setq endcol (current-column)) | |
74 (forward-line 1) | |
75 (setq endlinepos (point-marker))) | |
76 (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
|
77 (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
|
78 (save-excursion |
bef3a67ac893
(string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents:
2637
diff
changeset
|
79 (goto-char startlinepos) |
bef3a67ac893
(string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents:
2637
diff
changeset
|
80 (while (< (point) endlinepos) |
bef3a67ac893
(string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents:
2637
diff
changeset
|
81 (let (startpos begextra endextra) |
23757
717a33da04a1
(move-to-column-force): New function.
Kenichi Handa <handa@m17n.org>
parents:
23641
diff
changeset
|
82 (if coerce-tabs |
41173
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
83 (move-to-column startcol t) |
23757
717a33da04a1
(move-to-column-force): New function.
Kenichi Handa <handa@m17n.org>
parents:
23641
diff
changeset
|
84 (move-to-column startcol)) |
5787
bef3a67ac893
(string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents:
2637
diff
changeset
|
85 (setq begextra (- (current-column) startcol)) |
bef3a67ac893
(string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents:
2637
diff
changeset
|
86 (setq startpos (point)) |
23757
717a33da04a1
(move-to-column-force): New function.
Kenichi Handa <handa@m17n.org>
parents:
23641
diff
changeset
|
87 (if coerce-tabs |
41173
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
88 (move-to-column endcol t) |
23757
717a33da04a1
(move-to-column-force): New function.
Kenichi Handa <handa@m17n.org>
parents:
23641
diff
changeset
|
89 (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
|
90 ;; 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
|
91 ;; 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
|
92 (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
|
93 (backward-char 1)) |
5787
bef3a67ac893
(string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents:
2637
diff
changeset
|
94 (setq endextra (- endcol (current-column))) |
bef3a67ac893
(string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents:
2637
diff
changeset
|
95 (if (< begextra 0) |
bef3a67ac893
(string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents:
2637
diff
changeset
|
96 (setq endextra (+ endextra begextra) |
bef3a67ac893
(string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents:
2637
diff
changeset
|
97 begextra 0)) |
bef3a67ac893
(string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents:
2637
diff
changeset
|
98 (funcall function startpos begextra endextra)) |
bef3a67ac893
(string-rectangle): Make operate-on-rectangle convert tabs.
Richard M. Stallman <rms@gnu.org>
parents:
2637
diff
changeset
|
99 (forward-line 1))) |
36 | 100 (- endcol startcol))) |
101 | |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
102 ;; 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
|
103 (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
|
104 "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
|
105 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
|
106 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
|
107 the function is called." |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
108 (let (startcol startpt endcol endpt) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
109 (save-excursion |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
110 (goto-char start) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
111 (setq startcol (current-column)) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
112 (beginning-of-line) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
113 (setq startpt (point)) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
114 (goto-char end) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
115 (setq endcol (current-column)) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
116 (forward-line 1) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
117 (setq endpt (point-marker)) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
118 ;; 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
|
119 (if (< endcol startcol) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
120 (let ((col startcol)) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
121 (setq startcol endcol endcol col))) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
122 ;; start looping over lines |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
123 (goto-char startpt) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
124 (while (< (point) endpt) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
125 (apply function startcol endcol args) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
126 (forward-line 1))) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
127 )) |
36 | 128 |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
129 (defun delete-rectangle-line (startcol endcol fill) |
59783
b2ab001718c6
(delete-rectangle-line, delete-extract-rectangle-line)
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
130 (when (= (move-to-column startcol (if fill t 'coerce)) startcol) |
41173
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
131 (delete-region (point) |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
132 (progn (move-to-column endcol 'coerce) |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
133 (point))))) |
36 | 134 |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
135 (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
|
136 (let ((pt (point-at-eol))) |
59783
b2ab001718c6
(delete-rectangle-line, delete-extract-rectangle-line)
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
137 (if (< (move-to-column startcol (if fill t 'coerce)) startcol) |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
138 (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
|
139 (cdr lines))) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
140 ;; else |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
141 (setq pt (point)) |
41173
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
142 (move-to-column endcol t) |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
143 (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
|
144 (delete-region pt (point))) |
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 |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
147 ;; ### 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
|
148 ;; 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
|
149 ;; might be read-only. --dv |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
150 (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
|
151 (let (start end begextra endextra line) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
152 (move-to-column startcol) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
153 (setq start (point) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
154 begextra (- (current-column) startcol)) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
155 (move-to-column endcol) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
156 (setq end (point) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
157 endextra (- endcol (current-column))) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
158 (setq line (buffer-substring start (point))) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
159 (if (< begextra 0) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
160 (setq endextra (+ endextra begextra) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
161 begextra 0)) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
162 (if (< endextra 0) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
163 (setq endextra 0)) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
164 (goto-char start) |
36 | 165 (while (search-forward "\t" end t) |
166 (let ((width (- (current-column) | |
167 (save-excursion (forward-char -1) | |
168 (current-column))))) | |
169 (setq line (concat (substring line 0 (- (point) end 1)) | |
170 (spaces-string width) | |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
171 (substring line (+ (length line) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
172 (- (point) end))))))) |
36 | 173 (if (or (> begextra 0) (> endextra 0)) |
174 (setq line (concat (spaces-string begextra) | |
175 line | |
176 (spaces-string endextra)))) | |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
177 (setcdr lines (cons line (cdr lines))))) |
36 | 178 |
179 (defconst spaces-strings | |
180 '["" " " " " " " " " " " " " " " " "]) | |
181 | |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
182 ;; this one is untouched --dv |
36 | 183 (defun spaces-string (n) |
184 (if (<= n 8) (aref spaces-strings n) | |
185 (let ((val "")) | |
186 (while (> n 8) | |
187 (setq val (concat " " val) | |
188 n (- n 8))) | |
189 (concat val (aref spaces-strings n))))) | |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46512
diff
changeset
|
190 |
258 | 191 ;;;###autoload |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
192 (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
|
193 "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
|
194 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
|
195 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
|
196 ends. |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
197 |
25379
167c69238538
Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents:
25291
diff
changeset
|
198 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
|
199 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
|
200 to be deleted." |
167c69238538
Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents:
25291
diff
changeset
|
201 (interactive "*r\nP") |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
202 (apply-on-rectangle 'delete-rectangle-line start end fill)) |
36 | 203 |
258 | 204 ;;;###autoload |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
205 (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
|
206 "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
|
207 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
|
208 |
25379
167c69238538
Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents:
25291
diff
changeset
|
209 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
|
210 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
|
211 deleted." |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
212 (let ((lines (list nil))) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
213 (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
|
214 (nreverse (cdr lines)))) |
36 | 215 |
258 | 216 ;;;###autoload |
36 | 217 (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
|
218 "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
|
219 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
|
220 (let ((lines (list nil))) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
221 (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
|
222 (nreverse (cdr lines)))) |
36 | 223 |
224 (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
|
225 "Rectangle for `yank-rectangle' to insert.") |
36 | 226 |
258 | 227 ;;;###autoload |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
228 (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
|
229 "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
|
230 |
167c69238538
Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents:
25291
diff
changeset
|
231 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
|
232 You might prefer to use `delete-extract-rectangle' from a program. |
36 | 233 |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
234 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
|
235 deleted." |
25379
167c69238538
Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents:
25291
diff
changeset
|
236 (interactive "*r\nP") |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
237 (when buffer-read-only |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
238 (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
|
239 (barf-if-buffer-read-only)) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
240 (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
|
241 |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
242 ;; this one is untouched --dv |
258 | 243 ;;;###autoload |
36 | 244 (defun yank-rectangle () |
245 "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
|
246 (interactive "*") |
36 | 247 (insert-rectangle killed-rectangle)) |
248 | |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
249 ;; this one is untoutched --dv |
258 | 250 ;;;###autoload |
36 | 251 (defun insert-rectangle (rectangle) |
252 "Insert text of RECTANGLE with upper left corner at point. | |
242 | 253 RECTANGLE's first line is inserted at point, its second |
254 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
|
255 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
|
256 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
|
257 and point is at the lower right corner." |
36 | 258 (let ((lines rectangle) |
259 (insertcolumn (current-column)) | |
260 (first t)) | |
1542
724b443e445d
(insert-rectangle): Put mark at upper left corner.
Richard M. Stallman <rms@gnu.org>
parents:
845
diff
changeset
|
261 (push-mark) |
36 | 262 (while lines |
263 (or first | |
264 (progn | |
265 (forward-line 1) | |
266 (or (bolp) (insert ?\n)) | |
41173
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
267 (move-to-column insertcolumn t))) |
36 | 268 (setq first nil) |
44676
37fdab0b94fa
(insert-rectangle): Use insert-for-yank.
Richard M. Stallman <rms@gnu.org>
parents:
44207
diff
changeset
|
269 (insert-for-yank (car lines)) |
36 | 270 (setq lines (cdr lines))))) |
271 | |
258 | 272 ;;;###autoload |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
273 (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
|
274 "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
|
275 |
25379
167c69238538
Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents:
25291
diff
changeset
|
276 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
|
277 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
|
278 |
167c69238538
Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents:
25291
diff
changeset
|
279 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
|
280 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
|
281 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
|
282 (interactive "*r\nP") |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
283 (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
|
284 (goto-char start)) |
36 | 285 |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
286 (defun open-rectangle-line (startcol endcol fill) |
59783
b2ab001718c6
(delete-rectangle-line, delete-extract-rectangle-line)
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
287 (when (= (move-to-column startcol (if fill t 'coerce)) startcol) |
30283
70a7936c29c5
(open-rectangle-line): Remove unused let.
Dave Love <fx@gnu.org>
parents:
28078
diff
changeset
|
288 (unless (and (not fill) |
70a7936c29c5
(open-rectangle-line): Remove unused let.
Dave Love <fx@gnu.org>
parents:
28078
diff
changeset
|
289 (= (point) (point-at-eol))) |
70a7936c29c5
(open-rectangle-line): Remove unused let.
Dave Love <fx@gnu.org>
parents:
28078
diff
changeset
|
290 (indent-to endcol)))) |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
291 |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
292 (defun delete-whitespace-rectangle-line (startcol endcol fill) |
59783
b2ab001718c6
(delete-rectangle-line, delete-extract-rectangle-line)
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
293 (when (= (move-to-column startcol (if fill t 'coerce)) startcol) |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
294 (unless (= (point) (point-at-eol)) |
37444
d5ed9aa37aa2
(string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents:
33807
diff
changeset
|
295 (delete-region (point) (progn (skip-syntax-forward " ") (point)))))) |
36 | 296 |
45168
4f3c96288c84
(close-rectangle): Don't hide it behind the autoload-cookie.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
44676
diff
changeset
|
297 ;;;###autoload |
4f3c96288c84
(close-rectangle): Don't hide it behind the autoload-cookie.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
44676
diff
changeset
|
298 (defalias 'close-rectangle 'delete-whitespace-rectangle) ;; Old name |
4f3c96288c84
(close-rectangle): Don't hide it behind the autoload-cookie.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
44676
diff
changeset
|
299 |
258 | 300 ;;;###autoload |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
301 (defun delete-whitespace-rectangle (start end &optional fill) |
22205
8576d32229fc
(close-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
19732
diff
changeset
|
302 "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
|
303 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
|
304 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
|
305 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
|
306 |
25379
167c69238538
Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents:
25291
diff
changeset
|
307 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
|
308 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
|
309 (interactive "*r\nP") |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
310 (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
|
311 |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
312 ;; not used any more --dv |
22213
84c3c863f0bd
(string-rectangle-string): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22205
diff
changeset
|
313 ;; 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
|
314 ;; to string-rectangle-line. |
84c3c863f0bd
(string-rectangle-string): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
22205
diff
changeset
|
315 (defvar string-rectangle-string) |
41173
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
316 (defvar string-rectangle-history nil) |
33772
4787f33fe54f
(string-rectangle): Revert last change.
Dave Love <fx@gnu.org>
parents:
33750
diff
changeset
|
317 (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
|
318 (move-to-column startcol t) |
33772
4787f33fe54f
(string-rectangle): Revert last change.
Dave Love <fx@gnu.org>
parents:
33750
diff
changeset
|
319 (if delete |
4787f33fe54f
(string-rectangle): Revert last change.
Dave Love <fx@gnu.org>
parents:
33750
diff
changeset
|
320 (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
|
321 (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
|
322 |
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
|
323 ;;;###autoload |
37444
d5ed9aa37aa2
(string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents:
33807
diff
changeset
|
324 (defun string-rectangle (start end string) |
d5ed9aa37aa2
(string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents:
33807
diff
changeset
|
325 "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
|
326 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
|
327 |
d5ed9aa37aa2
(string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents:
33807
diff
changeset
|
328 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
|
329 (interactive |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
330 (progn (barf-if-buffer-read-only) |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
331 (list |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
332 (region-beginning) |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
333 (region-end) |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
334 (read-string (format "String rectangle (default `%s'): " |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
335 (or (car string-rectangle-history) "")) |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
336 nil 'string-rectangle-history |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
337 (car string-rectangle-history))))) |
33772
4787f33fe54f
(string-rectangle): Revert last change.
Dave Love <fx@gnu.org>
parents:
33750
diff
changeset
|
338 (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
|
339 |
44207
6c55bf040a71
(replace-rectangle): Add autoload.
Richard M. Stallman <rms@gnu.org>
parents:
43555
diff
changeset
|
340 ;;;###autoload |
37444
d5ed9aa37aa2
(string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents:
33807
diff
changeset
|
341 (defalias 'replace-rectangle 'string-rectangle) |
d5ed9aa37aa2
(string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents:
33807
diff
changeset
|
342 |
d5ed9aa37aa2
(string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents:
33807
diff
changeset
|
343 ;;;###autoload |
d5ed9aa37aa2
(string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents:
33807
diff
changeset
|
344 (defun string-insert-rectangle (start end string) |
d5ed9aa37aa2
(string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents:
33807
diff
changeset
|
345 "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
|
346 |
d5ed9aa37aa2
(string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents:
33807
diff
changeset
|
347 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
|
348 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
|
349 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
|
350 (interactive |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
351 (progn (barf-if-buffer-read-only) |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
352 (list |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
353 (region-beginning) |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
354 (region-end) |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
355 (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
|
356 (or (car string-rectangle-history) "")) |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
357 nil 'string-rectangle-history |
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
358 (car string-rectangle-history))))) |
37444
d5ed9aa37aa2
(string-rectangle): Revert to 20.x behaviour.
Gerd Moellmann <gerd@gnu.org>
parents:
33807
diff
changeset
|
359 (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
|
360 |
28078
99865d22cc31
2000-09-01 Didier Verna <didier@xemacs.org>
Dave Love <fx@gnu.org>
parents:
25380
diff
changeset
|
361 ;;;###autoload |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
362 (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
|
363 "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
|
364 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
|
365 |
25379
167c69238538
Add/fix various doc strings. Add `*' to all the interactive specs.
Dave Love <fx@gnu.org>
parents:
25291
diff
changeset
|
366 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
|
367 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
|
368 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
|
369 (interactive "*r\nP") |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
370 (apply-on-rectangle 'clear-rectangle-line start end fill)) |
36 | 371 |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
372 (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
|
373 (let ((pt (point-at-eol))) |
59783
b2ab001718c6
(delete-rectangle-line, delete-extract-rectangle-line)
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
374 (when (= (move-to-column startcol (if fill t 'coerce)) startcol) |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
375 (if (and (not fill) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
376 (<= (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
|
377 (delete-region (point) pt) |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
378 ;; else |
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
379 (setq pt (point)) |
41173
e1285c5daeaf
(move-to-column-force): Mark obsolete.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39537
diff
changeset
|
380 (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
|
381 (setq endcol (current-column)) |
25168
0fbd51325497
All functions rewritten, except when noted above
Richard M. Stallman <rms@gnu.org>
parents:
23812
diff
changeset
|
382 (delete-region pt (point)) |
43555
c33c91ae60fc
(clear-rectangle-line): Reindent to the same column
Richard M. Stallman <rms@gnu.org>
parents:
41173
diff
changeset
|
383 (indent-to endcol))))) |
36 | 384 |
1619
6147d2164331
* rect.el (operate-on-rectangle): Use move-to-column's FORCE
Jim Blandy <jimb@redhat.com>
parents:
1542
diff
changeset
|
385 (provide 'rect) |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
386 |
52401 | 387 ;;; arch-tag: 178847b3-1f50-4b03-83de-a6e911cc1d16 |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
258
diff
changeset
|
388 ;;; rect.el ends here |