Mercurial > emacs
annotate lisp/textmodes/picture.el @ 112224:4af12aa726d1
Abbrev.el fix for bug #7733. (tiny change)
* lisp/abbrev.el (prepare-abbrev-list-buffer): If listing local abbrev
table, get the value before switching to the output buffer.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Sun, 02 Jan 2011 22:13:35 -0800 |
parents | 376148b31b5e |
children | 417b1e4d63cd |
rev | line source |
---|---|
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
33927
diff
changeset
|
1 ;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
2 |
104543
da8b3e61b182
Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
3 ;; Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
112218
376148b31b5e
Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents:
111614
diff
changeset
|
4 ;; 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
846
20674ae6bf52
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
807
diff
changeset
|
5 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
6 ;; Author: K. Shane Hartman |
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
7 ;; Maintainer: FSF |
33927 | 8 ;; Keywords: convenience wp |
238 | 9 |
10 ;; This file is part of GNU Emacs. | |
11 | |
94670
f4a69fedbd46
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
12 ;; GNU Emacs is free software: you can redistribute it and/or modify |
238 | 13 ;; it under the terms of the GNU General Public License as published by |
94670
f4a69fedbd46
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
14 ;; the Free Software Foundation, either version 3 of the License, or |
f4a69fedbd46
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
15 ;; (at your option) any later version. |
238 | 16 |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
94670
f4a69fedbd46
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
238 | 24 |
2308
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1396
diff
changeset
|
25 ;;; Commentary: |
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1396
diff
changeset
|
26 |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
26078
diff
changeset
|
27 ;; This code provides the picture-mode commands documented in the Emacs |
2308
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1396
diff
changeset
|
28 ;; manual. The screen is treated as a semi-infinite quarter-plane with |
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1396
diff
changeset
|
29 ;; support for rectangle operations and `etch-a-sketch' character |
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1396
diff
changeset
|
30 ;; insertion in any of eight directions. |
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1396
diff
changeset
|
31 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
32 ;;; Code: |
238 | 33 |
20959 | 34 (defgroup picture nil |
38479
758a6e658e72
Doc and coding conventions fixes.
Pavel Janík <Pavel@Janik.cz>
parents:
38412
diff
changeset
|
35 "Picture mode --- editing using quarter-plane screen model." |
20959 | 36 :prefix "picture-" |
37 :group 'editing) | |
38 | |
39 (defcustom picture-rectangle-ctl ?+ | |
40 "*Character `picture-draw-rectangle' uses for top left corners." | |
41 :type 'character | |
42 :group 'picture) | |
43 (defcustom picture-rectangle-ctr ?+ | |
44 "*Character `picture-draw-rectangle' uses for top right corners." | |
45 :type 'character | |
46 :group 'picture) | |
47 (defcustom picture-rectangle-cbr ?+ | |
48 "*Character `picture-draw-rectangle' uses for bottom right corners." | |
49 :type 'character | |
50 :group 'picture) | |
51 (defcustom picture-rectangle-cbl ?+ | |
52 "*Character `picture-draw-rectangle' uses for bottom left corners." | |
53 :type 'character | |
54 :group 'picture) | |
55 (defcustom picture-rectangle-v ?| | |
56 "*Character `picture-draw-rectangle' uses for vertical lines." | |
57 :type 'character | |
58 :group 'picture) | |
59 (defcustom picture-rectangle-h ?- | |
60 "*Character `picture-draw-rectangle' uses for horizontal lines." | |
61 :type 'character | |
62 :group 'picture) | |
63 | |
238 | 64 |
65 ;; Picture Movement Commands | |
66 | |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
67 ;; When a cursor is on a wide-column character (e.g. Chinese, |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
68 ;; Japanese, Korean), this variable tells the desired current column |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
69 ;; which may be different from (current-column). |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
70 (defvar picture-desired-column 0) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
71 |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
72 ;; If the value of picture-desired-column is far from the current |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
73 ;; column, or if the arg ADJUST-TO-CURRENT is non-nil, set it to the |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
74 ;; current column. Return the current column. |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
75 (defun picture-update-desired-column (adjust-to-current) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
76 (let ((current-column (current-column))) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
77 (if (or adjust-to-current |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
78 (< picture-desired-column (1- current-column)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
79 (> picture-desired-column (1+ current-column))) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
80 (setq picture-desired-column current-column)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
81 current-column)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
82 |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
83 (defun picture-beginning-of-line (&optional arg) |
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
84 "Position point at the beginning of the line. |
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
85 With ARG not nil, move forward ARG - 1 lines first. |
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
86 If scan reaches end of buffer, stop there without error." |
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
87 (interactive "P") |
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
88 (if arg (forward-line (1- (prefix-numeric-value arg)))) |
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
89 (beginning-of-line) |
25106
bfdfc5515d48
(picture-beginning-of-line): Don't call
Dave Love <fx@gnu.org>
parents:
23756
diff
changeset
|
90 (setq picture-desired-column 0)) |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
91 |
238 | 92 (defun picture-end-of-line (&optional arg) |
93 "Position point after last non-blank character on current line. | |
94 With ARG not nil, move forward ARG - 1 lines first. | |
95 If scan reaches end of buffer, stop there without error." | |
96 (interactive "P") | |
97 (if arg (forward-line (1- (prefix-numeric-value arg)))) | |
98 (beginning-of-line) | |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
99 (skip-chars-backward " \t" (prog1 (point) (end-of-line))) |
25106
bfdfc5515d48
(picture-beginning-of-line): Don't call
Dave Love <fx@gnu.org>
parents:
23756
diff
changeset
|
100 (setq picture-desired-column (current-column))) |
238 | 101 |
43779
6f750829ab0a
(picture-forward-column): New arg `interactive'
Richard M. Stallman <rms@gnu.org>
parents:
41771
diff
changeset
|
102 (defun picture-forward-column (arg &optional interactive) |
238 | 103 "Move cursor right, making whitespace if necessary. |
104 With argument, move that many columns." | |
43779
6f750829ab0a
(picture-forward-column): New arg `interactive'
Richard M. Stallman <rms@gnu.org>
parents:
41771
diff
changeset
|
105 (interactive "p\nd") |
46103
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
106 (let (deactivate-mark) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
107 (picture-update-desired-column interactive) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
108 (setq picture-desired-column (max 0 (+ picture-desired-column arg))) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
109 (let ((current-column (move-to-column picture-desired-column t))) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
110 (if (and (> current-column picture-desired-column) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
111 (< arg 0)) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
112 ;; It seems that we have just tried to move to the right |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
113 ;; column of a multi-column character. |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
114 (forward-char -1))))) |
238 | 115 |
43779
6f750829ab0a
(picture-forward-column): New arg `interactive'
Richard M. Stallman <rms@gnu.org>
parents:
41771
diff
changeset
|
116 (defun picture-backward-column (arg &optional interactive) |
238 | 117 "Move cursor left, making whitespace if necessary. |
118 With argument, move that many columns." | |
43779
6f750829ab0a
(picture-forward-column): New arg `interactive'
Richard M. Stallman <rms@gnu.org>
parents:
41771
diff
changeset
|
119 (interactive "p\nd") |
6f750829ab0a
(picture-forward-column): New arg `interactive'
Richard M. Stallman <rms@gnu.org>
parents:
41771
diff
changeset
|
120 (picture-update-desired-column interactive) |
6120
121ee28dbda0
(picture-forward-column, picture-backward-column): Allow backward motion
Karl Heuer <kwzh@gnu.org>
parents:
6017
diff
changeset
|
121 (picture-forward-column (- arg))) |
238 | 122 |
123 (defun picture-move-down (arg) | |
124 "Move vertically down, making whitespace if necessary. | |
125 With argument, move that many lines." | |
126 (interactive "p") | |
46103
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
127 (let (deactivate-mark) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
128 (picture-update-desired-column nil) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
129 (picture-newline arg) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
130 (let ((current-column (move-to-column picture-desired-column t))) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
131 (if (> current-column picture-desired-column) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
132 (forward-char -1))))) |
238 | 133 |
41302
65b9b5655f50
(picture-vertical-step)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39891
diff
changeset
|
134 (defvar picture-vertical-step 0 |
238 | 135 "Amount to move vertically after text character in Picture mode.") |
136 | |
41302
65b9b5655f50
(picture-vertical-step)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39891
diff
changeset
|
137 (defvar picture-horizontal-step 1 |
238 | 138 "Amount to move horizontally after text character in Picture mode.") |
139 | |
140 (defun picture-move-up (arg) | |
141 "Move vertically up, making whitespace if necessary. | |
142 With argument, move that many lines." | |
143 (interactive "p") | |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
144 (picture-update-desired-column nil) |
238 | 145 (picture-move-down (- arg))) |
146 | |
147 (defun picture-movement-right () | |
148 "Move right after self-inserting character in Picture mode." | |
149 (interactive) | |
150 (picture-set-motion 0 1)) | |
151 | |
152 (defun picture-movement-left () | |
153 "Move left after self-inserting character in Picture mode." | |
154 (interactive) | |
155 (picture-set-motion 0 -1)) | |
156 | |
157 (defun picture-movement-up () | |
158 "Move up after self-inserting character in Picture mode." | |
159 (interactive) | |
160 (picture-set-motion -1 0)) | |
161 | |
162 (defun picture-movement-down () | |
163 "Move down after self-inserting character in Picture mode." | |
164 (interactive) | |
165 (picture-set-motion 1 0)) | |
166 | |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
167 (defun picture-movement-nw (&optional arg) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
168 "Move up and left after self-inserting character in Picture mode. |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
169 With prefix argument, move up and two-column left." |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
170 (interactive "P") |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
171 (picture-set-motion -1 (if arg -2 -1))) |
238 | 172 |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
173 (defun picture-movement-ne (&optional arg) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
174 "Move up and right after self-inserting character in Picture mode. |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
175 With prefix argument, move up and two-column right." |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
176 (interactive "P") |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
177 (picture-set-motion -1 (if arg 2 1))) |
238 | 178 |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
179 (defun picture-movement-sw (&optional arg) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
180 "Move down and left after self-inserting character in Picture mode. |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
181 With prefix argument, move down and two-column left." |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
182 (interactive "P") |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
183 (picture-set-motion 1 (if arg -2 -1))) |
238 | 184 |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
185 (defun picture-movement-se (&optional arg) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
186 "Move down and right after self-inserting character in Picture mode. |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
187 With prefix argument, move down and two-column right." |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
188 (interactive "P") |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
189 (picture-set-motion 1 (if arg 2 1))) |
238 | 190 |
191 (defun picture-set-motion (vert horiz) | |
192 "Set VERTICAL and HORIZONTAL increments for movement in Picture mode. | |
193 The mode line is updated to reflect the current direction." | |
194 (setq picture-vertical-step vert | |
195 picture-horizontal-step horiz) | |
196 (setq mode-name | |
197 (format "Picture:%s" | |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
198 (nth (+ 2 (% horiz 3) (* 5 (1+ (% vert 2)))) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
199 '(wnw nw up ne ene Left left none right Right |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
200 wsw sw down se ese)))) |
11574
a956f12b250f
(picture-set-motion, picture-mode-exit): Use force-mode-line-update.
Karl Heuer <kwzh@gnu.org>
parents:
10018
diff
changeset
|
201 (force-mode-line-update) |
238 | 202 (message "")) |
203 | |
204 (defun picture-move () | |
205 "Move in direction of `picture-vertical-step' and `picture-horizontal-step'." | |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
206 (if (/= picture-vertical-step 0) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
207 (picture-move-down picture-vertical-step)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
208 (if (/= picture-horizontal-step 0) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
209 (picture-forward-column picture-horizontal-step))) |
238 | 210 |
211 (defun picture-motion (arg) | |
212 "Move point in direction of current picture motion in Picture mode. | |
213 With ARG do it that many times. Useful for delineating rectangles in | |
214 conjunction with diagonal picture motion. | |
215 Do \\[command-apropos] picture-movement to see commands which control motion." | |
216 (interactive "p") | |
217 (picture-move-down (* arg picture-vertical-step)) | |
218 (picture-forward-column (* arg picture-horizontal-step))) | |
219 | |
220 (defun picture-motion-reverse (arg) | |
221 "Move point in direction opposite of current picture motion in Picture mode. | |
222 With ARG do it that many times. Useful for delineating rectangles in | |
223 conjunction with diagonal picture motion. | |
48014
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
224 Do \\[command-apropos] picture-movement to see commands which control motion." |
238 | 225 (interactive "p") |
226 (picture-motion (- arg))) | |
227 | |
48014
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
228 (defun picture-mouse-set-point (event) |
111614
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
229 "Move point to the position of EVENT, making whitespace if necessary." |
48014
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
230 (interactive "e") |
111614
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
231 (let ((position (event-start event))) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
232 (unless (posn-area position) ; Ignore EVENT unless in text area |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
233 (let* ((window (posn-window position)) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
234 (frame (if (framep window) window (window-frame window))) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
235 (pair (posn-x-y position)) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
236 (start-pos (window-start window)) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
237 (start-pair (posn-x-y (posn-at-point start-pos))) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
238 (dx (- (car pair) (car start-pair))) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
239 (dy (- (cdr pair) (cdr start-pair))) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
240 (char-ht (frame-char-height frame)) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
241 (spacing (when (display-graphic-p frame) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
242 (or (with-current-buffer (window-buffer window) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
243 line-spacing) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
244 (frame-parameter frame 'line-spacing)))) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
245 rows cols) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
246 (cond ((floatp spacing) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
247 (setq spacing (truncate (* spacing char-ht)))) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
248 ((null spacing) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
249 (setq spacing 0))) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
250 (goto-char start-pos) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
251 (picture-move-down (/ dy (+ char-ht spacing))) |
31f67bce5645
Fix picture-mouse-set-point calculation (Bug#7390).
Chong Yidong <cyd@stupidchicken.com>
parents:
106815
diff
changeset
|
252 (picture-forward-column (/ dx (frame-char-width frame))))))) |
48014
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
253 |
238 | 254 |
255 ;; Picture insertion and deletion. | |
256 | |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
257 (defun picture-insert (ch arg) |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
258 (let* ((width (char-width ch)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
259 ;; We must be sure that the succeeding insertion won't delete |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
260 ;; the just inserted character. |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
261 (picture-horizontal-step |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
262 (if (and (= picture-vertical-step 0) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
263 (> width 1) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
264 (< (abs picture-horizontal-step) 2)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
265 (* picture-horizontal-step 2) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
266 picture-horizontal-step))) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
267 (while (> arg 0) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
268 (setq arg (1- arg)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
269 (if (/= picture-desired-column (current-column)) |
43906
55003e5c6707
(picture-insert, picture-clear-column, picture-draw-rectangle):
Richard M. Stallman <rms@gnu.org>
parents:
43779
diff
changeset
|
270 (move-to-column picture-desired-column t)) |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
271 (let ((col (+ picture-desired-column width))) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
272 (or (eolp) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
273 (let ((pos (point))) |
43906
55003e5c6707
(picture-insert, picture-clear-column, picture-draw-rectangle):
Richard M. Stallman <rms@gnu.org>
parents:
43779
diff
changeset
|
274 (move-to-column col t) |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
275 (delete-region pos (point))))) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
276 (insert ch) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
277 (forward-char -1) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
278 (picture-move)))) |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
279 |
238 | 280 (defun picture-self-insert (arg) |
281 "Insert this character in place of character previously at the cursor. | |
282 The cursor then moves in the direction you previously specified | |
283 with the commands `picture-movement-right', `picture-movement-up', etc. | |
284 Do \\[command-apropos] `picture-movement' to see those commands." | |
285 (interactive "p") | |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
286 (picture-update-desired-column (not (eq this-command last-command))) |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
287 (picture-insert last-command-event arg)) ; Always a character in this case. |
238 | 288 |
289 (defun picture-clear-column (arg) | |
290 "Clear out ARG columns after point without moving." | |
291 (interactive "p") | |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
292 (let* ((original-col (current-column)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
293 (target-col (max 0 (+ original-col arg))) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
294 pos) |
43906
55003e5c6707
(picture-insert, picture-clear-column, picture-draw-rectangle):
Richard M. Stallman <rms@gnu.org>
parents:
43779
diff
changeset
|
295 (move-to-column target-col t) |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
296 (setq pos (point)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
297 (move-to-column original-col) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
298 (delete-region pos (point)) |
238 | 299 (save-excursion |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
300 (indent-to (max target-col original-col)))) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
301 (setq picture-desired-column (current-column))) |
238 | 302 |
303 (defun picture-backward-clear-column (arg) | |
304 "Clear out ARG columns before point, moving back over them." | |
305 (interactive "p") | |
306 (picture-clear-column (- arg))) | |
307 | |
308 (defun picture-clear-line (arg) | |
309 "Clear out rest of line; if at end of line, advance to next line. | |
310 Cleared-out line text goes into the kill ring, as do newlines that are | |
311 advanced over. With argument, clear out (and save in kill ring) that | |
312 many lines." | |
313 (interactive "P") | |
314 (if arg | |
315 (progn | |
316 (setq arg (prefix-numeric-value arg)) | |
317 (kill-line arg) | |
318 (newline (if (> arg 0) arg (- arg)))) | |
319 (if (looking-at "[ \t]*$") | |
320 (kill-ring-save (point) (progn (forward-line 1) (point))) | |
321 (kill-region (point) (progn (end-of-line) (point)))))) | |
322 | |
323 (defun picture-newline (arg) | |
324 "Move to the beginning of the following line. | |
325 With argument, moves that many lines (up, if negative argument); | |
326 always moves to the beginning of a line." | |
327 (interactive "p") | |
328 (if (< arg 0) | |
329 (forward-line arg) | |
330 (while (> arg 0) | |
331 (end-of-line) | |
332 (if (eobp) (newline) (forward-char 1)) | |
25106
bfdfc5515d48
(picture-beginning-of-line): Don't call
Dave Love <fx@gnu.org>
parents:
23756
diff
changeset
|
333 (setq arg (1- arg))))) |
238 | 334 |
335 (defun picture-open-line (arg) | |
336 "Insert an empty line after the current line. | |
337 With positive argument insert that many lines." | |
338 (interactive "p") | |
339 (save-excursion | |
340 (end-of-line) | |
25106
bfdfc5515d48
(picture-beginning-of-line): Don't call
Dave Love <fx@gnu.org>
parents:
23756
diff
changeset
|
341 (open-line arg))) |
238 | 342 |
343 (defun picture-duplicate-line () | |
344 "Insert a duplicate of the current line, below it." | |
345 (interactive) | |
346 (save-excursion | |
347 (let ((contents | |
348 (buffer-substring | |
349 (progn (beginning-of-line) (point)) | |
350 (progn (picture-newline 1) (point))))) | |
351 (forward-line -1) | |
352 (insert contents)))) | |
353 | |
3730
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
354 ;; Like replace-match, but overwrites. |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
355 (defun picture-replace-match (newtext fixedcase literal) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
356 (let (ocolumn change pos) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
357 (goto-char (setq pos (match-end 0))) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
358 (setq ocolumn (current-column)) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
359 ;; Make the replacement and undo it, to see how it changes the length. |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
360 (let ((buffer-undo-list nil) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
361 list1) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
362 (replace-match newtext fixedcase literal) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
363 (setq change (- (current-column) ocolumn)) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
364 (setq list1 buffer-undo-list) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
365 (while list1 |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
366 (setq list1 (primitive-undo 1 list1)))) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
367 (goto-char pos) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
368 (if (> change 0) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
369 (delete-region (point) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
370 (progn |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
371 (move-to-column (+ change (current-column)) t) |
3730
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
372 (point)))) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
373 (replace-match newtext fixedcase literal) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
374 (if (< change 0) |
63854
eb3b83171f68
(picture-replace-match): Change space constants followed by a sexp to "?\s ".
Juanma Barranquero <lekktu@gmail.com>
parents:
55178
diff
changeset
|
375 (insert-char ?\s (- change))))) |
238 | 376 |
377 ;; Picture Tabs | |
378 | |
20959 | 379 (defcustom picture-tab-chars "!-~" |
380 "*A character set which controls behavior of commands. | |
238 | 381 \\[picture-set-tab-stops] and \\[picture-tab-search]. It is NOT a |
382 regular expression, any regexp special characters will be quoted. | |
383 It defines a set of \"interesting characters\" to look for when setting | |
384 \(or searching for) tab stops, initially \"!-~\" (all printing characters). | |
385 For example, suppose that you are editing a table which is formatted thus: | |
386 | foo | bar + baz | 23 * | |
387 | bubbles | and + etc | 97 * | |
388 and that `picture-tab-chars' is \"|+*\". Then invoking | |
389 \\[picture-set-tab-stops] on either of the previous lines would result | |
390 in the following tab stops | |
391 : : : : | |
392 Another example - \"A-Za-z0-9\" would produce the tab stops | |
393 : : : : | |
394 | |
395 Note that if you want the character `-' to be in the set, it must be | |
396 included in a range or else appear in a context where it cannot be | |
397 taken for indicating a range (e.g. \"-A-Z\" declares the set to be the | |
398 letters `A' through `Z' and the character `-'). If you want the | |
399 character `\\' in the set it must be preceded by itself: \"\\\\\". | |
400 | |
401 The command \\[picture-tab-search] is defined to move beneath (or to) a | |
20959 | 402 character belonging to this set independent of the tab stops list." |
403 :type 'string | |
404 :group 'picture) | |
238 | 405 |
406 (defun picture-set-tab-stops (&optional arg) | |
407 "Set value of `tab-stop-list' according to context of this line. | |
408 This controls the behavior of \\[picture-tab]. A tab stop is set at | |
409 every column occupied by an \"interesting character\" that is preceded | |
410 by whitespace. Interesting characters are defined by the variable | |
411 `picture-tab-chars', see its documentation for an example of usage. | |
412 With ARG, just (re)set `tab-stop-list' to its default value. The tab | |
413 stops computed are displayed in the minibuffer with `:' at each stop." | |
414 (interactive "P") | |
415 (save-excursion | |
416 (let (tabs) | |
417 (if arg | |
418 (setq tabs (default-value 'tab-stop-list)) | |
419 (let ((regexp (concat "[ \t]+[" (regexp-quote picture-tab-chars) "]"))) | |
420 (beginning-of-line) | |
421 (let ((bol (point))) | |
422 (end-of-line) | |
423 (while (re-search-backward regexp bol t) | |
424 (skip-chars-forward " \t") | |
425 (setq tabs (cons (current-column) tabs))) | |
426 (if (null tabs) | |
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
33927
diff
changeset
|
427 (error "No characters in set %s on this line" |
238 | 428 (regexp-quote picture-tab-chars)))))) |
429 (setq tab-stop-list tabs) | |
430 (let ((blurb (make-string (1+ (nth (1- (length tabs)) tabs)) ?\ ))) | |
431 (while tabs | |
432 (aset blurb (car tabs) ?:) | |
433 (setq tabs (cdr tabs))) | |
434 (message blurb))))) | |
435 | |
436 (defun picture-tab-search (&optional arg) | |
437 "Move to column beneath next interesting char in previous line. | |
438 With ARG move to column occupied by next interesting character in this | |
439 line. The character must be preceded by whitespace. | |
440 \"interesting characters\" are defined by variable `picture-tab-chars'. | |
441 If no such character is found, move to beginning of line." | |
442 (interactive "P") | |
443 (let ((target (current-column))) | |
444 (save-excursion | |
445 (if (and (not arg) | |
446 (progn | |
447 (beginning-of-line) | |
448 (skip-chars-backward | |
449 (concat "^" (regexp-quote picture-tab-chars)) | |
450 (point-min)) | |
451 (not (bobp)))) | |
452 (move-to-column target)) | |
453 (if (re-search-forward | |
454 (concat "[ \t]+[" (regexp-quote picture-tab-chars) "]") | |
455 (save-excursion (end-of-line) (point)) | |
456 'move) | |
457 (setq target (1- (current-column))) | |
458 (setq target nil))) | |
459 (if target | |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
460 (move-to-column target t) |
238 | 461 (beginning-of-line)))) |
462 | |
463 (defun picture-tab (&optional arg) | |
464 "Tab transparently (just move point) to next tab stop. | |
465 With prefix arg, overwrite the traversed text with spaces. The tab stop | |
466 list can be changed by \\[picture-set-tab-stops] and \\[edit-tab-stops]. | |
467 See also documentation for variable `picture-tab-chars'." | |
468 (interactive "P") | |
469 (let* ((opoint (point))) | |
470 (move-to-tab-stop) | |
471 (if arg | |
472 (let (indent-tabs-mode | |
473 (column (current-column))) | |
474 (delete-region opoint (point)) | |
475 (indent-to column))))) | |
476 | |
477 ;; Picture Rectangles | |
478 | |
26078
1dfff19134ab
(picture-killed-rectangle): Use defvar, not defconst.
Dave Love <fx@gnu.org>
parents:
25106
diff
changeset
|
479 (defvar picture-killed-rectangle nil |
238 | 480 "Rectangle killed or copied by \\[picture-clear-rectangle] in Picture mode. |
481 The contents can be retrieved by \\[picture-yank-rectangle]") | |
482 | |
483 (defun picture-clear-rectangle (start end &optional killp) | |
484 "Clear and save rectangle delineated by point and mark. | |
485 The rectangle is saved for yanking by \\[picture-yank-rectangle] and replaced | |
486 with whitespace. The previously saved rectangle, if any, is lost. With | |
487 prefix argument, the rectangle is actually killed, shifting remaining text." | |
488 (interactive "r\nP") | |
489 (setq picture-killed-rectangle (picture-snarf-rectangle start end killp))) | |
490 | |
491 (defun picture-clear-rectangle-to-register (start end register &optional killp) | |
492 "Clear rectangle delineated by point and mark into REGISTER. | |
493 The rectangle is saved in REGISTER and replaced with whitespace. With | |
494 prefix argument, the rectangle is actually killed, shifting remaining text." | |
495 (interactive "r\ncRectangle to register: \nP") | |
496 (set-register register (picture-snarf-rectangle start end killp))) | |
497 | |
498 (defun picture-snarf-rectangle (start end &optional killp) | |
499 (let ((column (current-column)) | |
500 (indent-tabs-mode nil)) | |
501 (prog1 (save-excursion | |
502 (if killp | |
503 (delete-extract-rectangle start end) | |
504 (prog1 (extract-rectangle start end) | |
505 (clear-rectangle start end)))) | |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
506 (move-to-column column t)))) |
238 | 507 |
508 (defun picture-yank-rectangle (&optional insertp) | |
509 "Overlay rectangle saved by \\[picture-clear-rectangle] | |
510 The rectangle is positioned with upper left corner at point, overwriting | |
511 existing text. With prefix argument, the rectangle is inserted instead, | |
512 shifting existing text. Leaves mark at one corner of rectangle and | |
513 point at the other (diagonally opposed) corner." | |
514 (interactive "P") | |
515 (if (not (consp picture-killed-rectangle)) | |
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
33927
diff
changeset
|
516 (error "No rectangle saved") |
238 | 517 (picture-insert-rectangle picture-killed-rectangle insertp))) |
518 | |
8915
991438f3f39a
(picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
519 (defun picture-yank-at-click (click arg) |
991438f3f39a
(picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
520 "Insert the last killed rectangle at the position clicked on. |
991438f3f39a
(picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
521 Also move point to one end of the text thus inserted (normally the end). |
991438f3f39a
(picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
522 Prefix arguments are interpreted as with \\[yank]. |
991438f3f39a
(picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
523 If `mouse-yank-at-point' is non-nil, insert at point |
991438f3f39a
(picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
524 regardless of where you click." |
991438f3f39a
(picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
525 (interactive "e\nP") |
991438f3f39a
(picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
526 (or mouse-yank-at-point (mouse-set-point click)) |
991438f3f39a
(picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
527 (picture-yank-rectangle arg)) |
991438f3f39a
(picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
528 |
238 | 529 (defun picture-yank-rectangle-from-register (register &optional insertp) |
530 "Overlay rectangle saved in REGISTER. | |
531 The rectangle is positioned with upper left corner at point, overwriting | |
532 existing text. With prefix argument, the rectangle is | |
533 inserted instead, shifting existing text. Leaves mark at one corner | |
534 of rectangle and point at the other (diagonally opposed) corner." | |
535 (interactive "cRectangle from register: \nP") | |
536 (let ((rectangle (get-register register))) | |
537 (if (not (consp rectangle)) | |
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
33927
diff
changeset
|
538 (error "Register %c does not contain a rectangle" register) |
238 | 539 (picture-insert-rectangle rectangle insertp)))) |
540 | |
541 (defun picture-insert-rectangle (rectangle &optional insertp) | |
542 "Overlay RECTANGLE with upper left corner at point. | |
543 Optional argument INSERTP, if non-nil causes RECTANGLE to be inserted. | |
544 Leaves the region surrounding the rectangle." | |
545 (let ((indent-tabs-mode nil)) | |
546 (if (not insertp) | |
547 (save-excursion | |
548 (delete-rectangle (point) | |
549 (progn | |
550 (picture-forward-column (length (car rectangle))) | |
551 (picture-move-down (1- (length rectangle))) | |
552 (point))))) | |
553 (push-mark) | |
554 (insert-rectangle rectangle))) | |
555 | |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
556 (defun picture-current-line () |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
557 "Return the vertical position of point. Top line is 1." |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
558 (+ (count-lines (point-min) (point)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
559 (if (= (current-column) 0) 1 0))) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
560 |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
561 (defun picture-draw-rectangle (start end) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
562 "Draw a rectangle around region." |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
563 (interactive "*r") ; start will be less than end |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
564 (let* ((sl (picture-current-line)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
565 (sc (current-column)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
566 (pvs picture-vertical-step) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
567 (phs picture-horizontal-step) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
568 (c1 (progn (goto-char start) (current-column))) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
569 (r1 (picture-current-line)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
570 (c2 (progn (goto-char end) (current-column))) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
571 (r2 (picture-current-line)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
572 (right (max c1 c2)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
573 (left (min c1 c2)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
574 (top (min r1 r2)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
575 (bottom (max r1 r2))) |
104543
da8b3e61b182
Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
576 (goto-char (point-min)) |
da8b3e61b182
Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
577 (forward-line (1- top)) |
43906
55003e5c6707
(picture-insert, picture-clear-column, picture-draw-rectangle):
Richard M. Stallman <rms@gnu.org>
parents:
43779
diff
changeset
|
578 (move-to-column left t) |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
579 (picture-update-desired-column t) |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
580 |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
581 (picture-movement-right) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
582 (picture-insert picture-rectangle-ctl 1) |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
583 (picture-insert picture-rectangle-h (- right picture-desired-column)) |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
584 |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
585 (picture-movement-down) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
586 (picture-insert picture-rectangle-ctr 1) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
587 (picture-insert picture-rectangle-v (- bottom (picture-current-line))) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
588 |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
589 (picture-movement-left) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
590 (picture-insert picture-rectangle-cbr 1) |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
591 (picture-insert picture-rectangle-h (- picture-desired-column left)) |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
592 |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
593 (picture-movement-up) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
594 (picture-insert picture-rectangle-cbl 1) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
595 (picture-insert picture-rectangle-v (- (picture-current-line) top)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
596 |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
597 (picture-set-motion pvs phs) |
104543
da8b3e61b182
Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
598 (goto-char (point-min)) |
da8b3e61b182
Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
599 (forward-line (1- sl)) |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
600 (move-to-column sc t))) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
601 |
238 | 602 |
603 ;; Picture Keymap, entry and exit points. | |
604 | |
41771
66882a00d38d
(picture-mode-map): Don't use defconst for a variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41302
diff
changeset
|
605 (defvar picture-mode-map nil) |
238 | 606 |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
607 (defun picture-substitute (oldfun newfun) |
49177
f47ff7e8f5f5
(picture-substitute): Use command remapping instead of
Andreas Schwab <schwab@suse.de>
parents:
48014
diff
changeset
|
608 (define-key picture-mode-map (vector 'remap oldfun) newfun)) |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
609 |
238 | 610 (if (not picture-mode-map) |
10018
2c6b612b358c
(picture-self-insert): Use last-command-event,
Richard M. Stallman <rms@gnu.org>
parents:
8915
diff
changeset
|
611 (progn |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
612 (setq picture-mode-map (make-keymap)) |
10018
2c6b612b358c
(picture-self-insert): Use last-command-event,
Richard M. Stallman <rms@gnu.org>
parents:
8915
diff
changeset
|
613 (picture-substitute 'self-insert-command 'picture-self-insert) |
14567
94dd08880c3b
(picture-mode-map): Install picture-self-insert
Richard M. Stallman <rms@gnu.org>
parents:
14324
diff
changeset
|
614 (picture-substitute 'completion-separator-self-insert-command |
94dd08880c3b
(picture-mode-map): Install picture-self-insert
Richard M. Stallman <rms@gnu.org>
parents:
14324
diff
changeset
|
615 'picture-self-insert) |
94dd08880c3b
(picture-mode-map): Install picture-self-insert
Richard M. Stallman <rms@gnu.org>
parents:
14324
diff
changeset
|
616 (picture-substitute 'completion-separator-self-insert-autofilling |
94dd08880c3b
(picture-mode-map): Install picture-self-insert
Richard M. Stallman <rms@gnu.org>
parents:
14324
diff
changeset
|
617 'picture-self-insert) |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
618 (picture-substitute 'forward-char 'picture-forward-column) |
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
619 (picture-substitute 'backward-char 'picture-backward-column) |
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
620 (picture-substitute 'delete-char 'picture-clear-column) |
6017
cf744280a5a4
(picture-mode-map): Replace delete-backward-char
Richard M. Stallman <rms@gnu.org>
parents:
5316
diff
changeset
|
621 ;; There are two possibilities for what is normally on DEL. |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
622 (picture-substitute 'backward-delete-char-untabify 'picture-backward-clear-column) |
6017
cf744280a5a4
(picture-mode-map): Replace delete-backward-char
Richard M. Stallman <rms@gnu.org>
parents:
5316
diff
changeset
|
623 (picture-substitute 'delete-backward-char 'picture-backward-clear-column) |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
624 (picture-substitute 'kill-line 'picture-clear-line) |
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
625 (picture-substitute 'open-line 'picture-open-line) |
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
626 (picture-substitute 'newline 'picture-newline) |
10018
2c6b612b358c
(picture-self-insert): Use last-command-event,
Richard M. Stallman <rms@gnu.org>
parents:
8915
diff
changeset
|
627 (picture-substitute 'newline-and-indent 'picture-duplicate-line) |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
628 (picture-substitute 'next-line 'picture-move-down) |
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
629 (picture-substitute 'previous-line 'picture-move-up) |
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
630 (picture-substitute 'beginning-of-line 'picture-beginning-of-line) |
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
631 (picture-substitute 'end-of-line 'picture-end-of-line) |
48014
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
632 (picture-substitute 'mouse-set-point 'picture-mouse-set-point) |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
633 |
238 | 634 (define-key picture-mode-map "\C-c\C-d" 'delete-char) |
635 (define-key picture-mode-map "\e\t" 'picture-toggle-tab-state) | |
636 (define-key picture-mode-map "\t" 'picture-tab) | |
637 (define-key picture-mode-map "\e\t" 'picture-tab-search) | |
638 (define-key picture-mode-map "\C-c\t" 'picture-set-tab-stops) | |
639 (define-key picture-mode-map "\C-c\C-k" 'picture-clear-rectangle) | |
640 (define-key picture-mode-map "\C-c\C-w" 'picture-clear-rectangle-to-register) | |
641 (define-key picture-mode-map "\C-c\C-y" 'picture-yank-rectangle) | |
642 (define-key picture-mode-map "\C-c\C-x" 'picture-yank-rectangle-from-register) | |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
643 (define-key picture-mode-map "\C-c\C-r" 'picture-draw-rectangle) |
238 | 644 (define-key picture-mode-map "\C-c\C-c" 'picture-mode-exit) |
645 (define-key picture-mode-map "\C-c\C-f" 'picture-motion) | |
646 (define-key picture-mode-map "\C-c\C-b" 'picture-motion-reverse) | |
647 (define-key picture-mode-map "\C-c<" 'picture-movement-left) | |
648 (define-key picture-mode-map "\C-c>" 'picture-movement-right) | |
649 (define-key picture-mode-map "\C-c^" 'picture-movement-up) | |
650 (define-key picture-mode-map "\C-c." 'picture-movement-down) | |
651 (define-key picture-mode-map "\C-c`" 'picture-movement-nw) | |
652 (define-key picture-mode-map "\C-c'" 'picture-movement-ne) | |
653 (define-key picture-mode-map "\C-c/" 'picture-movement-sw) | |
55178
dd3da2fb7ef3
(picture-mode-map): Add arrow keys.
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
654 (define-key picture-mode-map "\C-c\\" 'picture-movement-se) |
dd3da2fb7ef3
(picture-mode-map): Add arrow keys.
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
655 (define-key picture-mode-map [(control ?c) left] 'picture-movement-left) |
dd3da2fb7ef3
(picture-mode-map): Add arrow keys.
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
656 (define-key picture-mode-map [(control ?c) right] 'picture-movement-right) |
dd3da2fb7ef3
(picture-mode-map): Add arrow keys.
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
657 (define-key picture-mode-map [(control ?c) up] 'picture-movement-up) |
dd3da2fb7ef3
(picture-mode-map): Add arrow keys.
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
658 (define-key picture-mode-map [(control ?c) down] 'picture-movement-down) |
dd3da2fb7ef3
(picture-mode-map): Add arrow keys.
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
659 (define-key picture-mode-map [(control ?c) home] 'picture-movement-nw) |
dd3da2fb7ef3
(picture-mode-map): Add arrow keys.
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
660 (define-key picture-mode-map [(control ?c) prior] 'picture-movement-ne) |
dd3da2fb7ef3
(picture-mode-map): Add arrow keys.
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
661 (define-key picture-mode-map [(control ?c) end] 'picture-movement-sw) |
dd3da2fb7ef3
(picture-mode-map): Add arrow keys.
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
662 (define-key picture-mode-map [(control ?c) next] 'picture-movement-se))) |
238 | 663 |
20959 | 664 (defcustom picture-mode-hook nil |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
665 "If non-nil, its value is called on entry to Picture mode. |
20959 | 666 Picture mode is invoked by the command \\[picture-mode]." |
667 :type 'hook | |
668 :group 'picture) | |
238 | 669 |
875 | 670 (defvar picture-mode-old-local-map) |
671 (defvar picture-mode-old-mode-name) | |
672 (defvar picture-mode-old-major-mode) | |
5316
9bf2ae74a7bd
(picture-mode): Save the old truncate-lines value.
Richard M. Stallman <rms@gnu.org>
parents:
3730
diff
changeset
|
673 (defvar picture-mode-old-truncate-lines) |
875 | 674 |
256 | 675 ;;;###autoload |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
676 (defun picture-mode () |
238 | 677 "Switch to Picture mode, in which a quarter-plane screen model is used. |
67646
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
678 \\<picture-mode-map> |
238 | 679 Printing characters replace instead of inserting themselves with motion |
680 afterwards settable by these commands: | |
67646
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
681 |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
682 Move left after insertion: \\[picture-movement-left] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
683 Move right after insertion: \\[picture-movement-right] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
684 Move up after insertion: \\[picture-movement-up] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
685 Move down after insertion: \\[picture-movement-down] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
686 |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
687 Move northwest (nw) after insertion: \\[picture-movement-nw] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
688 Move northeast (ne) after insertion: \\[picture-movement-ne] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
689 Move southwest (sw) after insertion: \\[picture-movement-sw] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
690 Move southeast (se) after insertion: \\[picture-movement-se] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
691 |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
692 Move westnorthwest (wnw) after insertion: C-u \\[picture-movement-nw] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
693 Move eastnortheast (ene) after insertion: C-u \\[picture-movement-ne] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
694 Move westsouthwest (wsw) after insertion: C-u \\[picture-movement-sw] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
695 Move eastsoutheast (ese) after insertion: C-u \\[picture-movement-se] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
696 |
238 | 697 The current direction is displayed in the mode line. The initial |
698 direction is right. Whitespace is inserted and tabs are changed to | |
699 spaces when required by movement. You can move around in the buffer | |
700 with these commands: | |
67646
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
701 |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
702 Move vertically to SAME column in previous line: \\[picture-move-down] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
703 Move vertically to SAME column in next line: \\[picture-move-up] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
704 Move to column following last |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
705 non-whitespace character: \\[picture-end-of-line] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
706 Move right, inserting spaces if required: \\[picture-forward-column] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
707 Move left changing tabs to spaces if required: \\[picture-backward-column] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
708 Move in direction of current picture motion: \\[picture-motion] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
709 Move opposite to current picture motion: \\[picture-motion-reverse] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
710 Move to beginning of next line: \\[next-line] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
711 |
238 | 712 You can edit tabular text with these commands: |
67646
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
713 |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
714 Move to column beneath (or at) next interesting |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
715 character (see variable `picture-tab-chars'): \\[picture-tab-search] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
716 Move to next stop in tab stop list: \\[picture-tab] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
717 Set tab stops according to context of this line: \\[picture-set-tab-stops] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
718 (With ARG, resets tab stops to default value.) |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
719 Change the tab stop list: \\[edit-tab-stops] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
720 |
238 | 721 You can manipulate text with these commands: |
67646
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
722 Clear ARG columns after point without moving: \\[picture-clear-column] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
723 Delete char at point: \\[delete-char] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
724 Clear ARG columns backward: \\[picture-backward-clear-column] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
725 Clear ARG lines, advancing over them: \\[picture-clear-line] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
726 (the cleared text is saved in the kill ring) |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
727 Open blank line(s) beneath current line: \\[picture-open-line] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
728 |
238 | 729 You can manipulate rectangles with these commands: |
67646
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
730 Clear a rectangle and save it: \\[picture-clear-rectangle] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
731 Clear a rectangle, saving in a named register: \\[picture-clear-rectangle-to-register] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
732 Insert currently saved rectangle at point: \\[picture-yank-rectangle] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
733 Insert rectangle from named register: \\[picture-yank-rectangle-from-register] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
734 Draw a rectangular box around mark and point: \\[picture-draw-rectangle] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
735 Copies a rectangle to a register: \\[copy-rectangle-to-register] |
104922
c603ee2aac17
* keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104543
diff
changeset
|
736 Undo effects of rectangle overlay commands: \\[undo] |
67646
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
737 |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
738 You can return to the previous mode with \\[picture-mode-exit], which |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
739 also strips trailing whitespace from every line. Stripping is suppressed |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
740 by supplying an argument. |
238 | 741 |
39891
34c05876ce21
(picture-mode): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38479
diff
changeset
|
742 Entry to this mode calls the value of `picture-mode-hook' if non-nil. |
238 | 743 |
744 Note that Picture mode commands will work outside of Picture mode, but | |
745 they are not defaultly assigned to keys." | |
746 (interactive) | |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
747 (if (eq major-mode 'picture-mode) |
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
33927
diff
changeset
|
748 (error "You are already editing a picture") |
39891
34c05876ce21
(picture-mode): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38479
diff
changeset
|
749 (set (make-local-variable 'picture-mode-old-local-map) (current-local-map)) |
238 | 750 (use-local-map picture-mode-map) |
39891
34c05876ce21
(picture-mode): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38479
diff
changeset
|
751 (set (make-local-variable 'picture-mode-old-mode-name) mode-name) |
34c05876ce21
(picture-mode): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38479
diff
changeset
|
752 (set (make-local-variable 'picture-mode-old-major-mode) major-mode) |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
753 (setq major-mode 'picture-mode) |
39891
34c05876ce21
(picture-mode): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38479
diff
changeset
|
754 (set (make-local-variable 'picture-killed-rectangle) nil) |
34c05876ce21
(picture-mode): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38479
diff
changeset
|
755 (set (make-local-variable 'tab-stop-list) (default-value 'tab-stop-list)) |
34c05876ce21
(picture-mode): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38479
diff
changeset
|
756 (set (make-local-variable 'picture-tab-chars) |
34c05876ce21
(picture-mode): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38479
diff
changeset
|
757 (default-value 'picture-tab-chars)) |
238 | 758 (make-local-variable 'picture-vertical-step) |
759 (make-local-variable 'picture-horizontal-step) | |
39891
34c05876ce21
(picture-mode): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38479
diff
changeset
|
760 (set (make-local-variable 'picture-mode-old-truncate-lines) truncate-lines) |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
761 (setq truncate-lines t) |
238 | 762 (picture-set-motion 0 1) |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
763 |
1396
17365cdb1c10
(edit-picture): Run picture-mode-hook.
Richard M. Stallman <rms@gnu.org>
parents:
875
diff
changeset
|
764 ;; edit-picture-hook is what we used to run, picture-mode-hook is in doc. |
17365cdb1c10
(edit-picture): Run picture-mode-hook.
Richard M. Stallman <rms@gnu.org>
parents:
875
diff
changeset
|
765 (run-hooks 'edit-picture-hook 'picture-mode-hook) |
14324
fae2e1075bcf
(picture-mode): Pass proper format string to message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
766 (message "Type %s in this buffer to return it to %s mode." |
fae2e1075bcf
(picture-mode): Pass proper format string to message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
767 (substitute-command-keys "\\[picture-mode-exit]") |
fae2e1075bcf
(picture-mode): Pass proper format string to message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
768 picture-mode-old-mode-name))) |
238 | 769 |
269 | 770 ;;;###autoload |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
771 (defalias 'edit-picture 'picture-mode) |
238 | 772 |
773 (defun picture-mode-exit (&optional nostrip) | |
41771
66882a00d38d
(picture-mode-map): Don't use defconst for a variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41302
diff
changeset
|
774 "Undo `picture-mode' and return to previous major mode. |
69905
b45b825f9e2a
(picture-mode-exit): Run picture-mode-exit-hook.
Richard M. Stallman <rms@gnu.org>
parents:
68648
diff
changeset
|
775 With no argument, strip whitespace from end of every line in Picture buffer; |
b45b825f9e2a
(picture-mode-exit): Run picture-mode-exit-hook.
Richard M. Stallman <rms@gnu.org>
parents:
68648
diff
changeset
|
776 otherwise, just return to previous mode. |
b45b825f9e2a
(picture-mode-exit): Run picture-mode-exit-hook.
Richard M. Stallman <rms@gnu.org>
parents:
68648
diff
changeset
|
777 Runs `picture-mode-exit-hook' at the end." |
238 | 778 (interactive "P") |
2595
6a1ad0661928
Completed the package entry point's name change from edit-picture to
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2571
diff
changeset
|
779 (if (not (eq major-mode 'picture-mode)) |
38412
253f761ad37b
Some fixes to follow coding conventions in files maintained by FSF.
Pavel Janík <Pavel@Janik.cz>
parents:
33927
diff
changeset
|
780 (error "You aren't editing a Picture") |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
26078
diff
changeset
|
781 (if (not nostrip) (delete-trailing-whitespace)) |
238 | 782 (setq mode-name picture-mode-old-mode-name) |
783 (use-local-map picture-mode-old-local-map) | |
784 (setq major-mode picture-mode-old-major-mode) | |
785 (kill-local-variable 'tab-stop-list) | |
5316
9bf2ae74a7bd
(picture-mode): Save the old truncate-lines value.
Richard M. Stallman <rms@gnu.org>
parents:
3730
diff
changeset
|
786 (setq truncate-lines picture-mode-old-truncate-lines) |
69905
b45b825f9e2a
(picture-mode-exit): Run picture-mode-exit-hook.
Richard M. Stallman <rms@gnu.org>
parents:
68648
diff
changeset
|
787 (force-mode-line-update) |
b45b825f9e2a
(picture-mode-exit): Run picture-mode-exit-hook.
Richard M. Stallman <rms@gnu.org>
parents:
68648
diff
changeset
|
788 (run-hooks 'picture-mode-exit-hook))) |
238 | 789 |
584 | 790 (provide 'picture) |
791 | |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
79719
diff
changeset
|
792 ;; arch-tag: e452d08d-a470-4fbf-896e-ea276698d1ca |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
793 ;;; picture.el ends here |