Mercurial > emacs
annotate lisp/textmodes/picture.el @ 83619:5da6a46ddbd6
* s/darwin.h (SYSTEM_PURESIZE_EXTRA): Define here.
* termhooks.h (union display_info): Add mac_display_info.
* term.c (init_tty): Only use terminal->kboard when MULTI_KBOARD
is defined.
* macterm.h (struct mac_display_info): Add terminal.
* w32term.c (w32_initialize): Make static.
* macterm.c (XTset_terminal_modes): Add a terminal parameter.
(XTreset_terminal_modes): Likewise.
(x_clear_frame): Add a frame parameter.
(note_mouse_movement): Get rif from the frame.
(mac_term_init): Initialize the terminal.
(mac_initialize): Make static and move terminal initialization ...
(mac_create_terminal): ... in this new function.
* macmenu.c: Reorder includes.
(Fx_popup_menu): Use terminal specific mouse_position_hook.
* macfns.c (x_set_mouse_color): Get rif from the frame.
(x_set_tool_bar_lines): Don't use updating_frame.
(mac_window): Add 2 new parameters for consistency with other
systems.
(Fx_create_frame): Fix doc string. Rename the parameter.
(Fx_create_frame): Set the frame parameters following what is done
in X11 and w32.
(Fx_open_connection): Remove window-system check.
(start_hourglass): Likewise.
(x_create_tip_frame): Get the keyboard from the terminal.
* w32fns.c (Fx_create_frame): Use kboard from the terminal.
* term/mac-win.el: Provide mac-win.
(mac-initialized): New variable.
(mac-initialize-window-system): New function. Move global setup
here.
(handle-args-function-alist, frame-creation-function-alist):
(window-system-initialization-alist): Add mac entries.
* loadup.el: Load mac-win on a Mac.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Sat, 19 May 2007 19:08:02 +0000 |
parents | e3694f1cb928 |
children | b6d25790aab2 95d0cdf160ea |
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 |
74509 | 3 ;; Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004, |
75347 | 4 ;; 2005, 2006, 2007 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 | |
12 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
13 ;; 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:
659
diff
changeset
|
14 ;; the Free Software Foundation; either version 2, or (at your option) |
238 | 15 ;; any later version. |
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 | |
14169 | 23 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64084 | 24 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
25 ;; Boston, MA 02110-1301, USA. | |
238 | 26 |
2308
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1396
diff
changeset
|
27 ;;; Commentary: |
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1396
diff
changeset
|
28 |
33786
9f63b158eb6b
* simple.el (delete-trailing-whitespace): New interactive function.
Sam Steingold <sds@gnu.org>
parents:
26078
diff
changeset
|
29 ;; 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
|
30 ;; 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
|
31 ;; 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
|
32 ;; insertion in any of eight directions. |
f287613dfc28
Added or corrected Commentary sections
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
1396
diff
changeset
|
33 |
807
4f28bd14272c
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
659
diff
changeset
|
34 ;;; Code: |
238 | 35 |
20959 | 36 (defgroup picture nil |
38479
758a6e658e72
Doc and coding conventions fixes.
Pavel Janík <Pavel@Janik.cz>
parents:
38412
diff
changeset
|
37 "Picture mode --- editing using quarter-plane screen model." |
20959 | 38 :prefix "picture-" |
39 :group 'editing) | |
40 | |
41 (defcustom picture-rectangle-ctl ?+ | |
42 "*Character `picture-draw-rectangle' uses for top left corners." | |
43 :type 'character | |
44 :group 'picture) | |
45 (defcustom picture-rectangle-ctr ?+ | |
46 "*Character `picture-draw-rectangle' uses for top right corners." | |
47 :type 'character | |
48 :group 'picture) | |
49 (defcustom picture-rectangle-cbr ?+ | |
50 "*Character `picture-draw-rectangle' uses for bottom right corners." | |
51 :type 'character | |
52 :group 'picture) | |
53 (defcustom picture-rectangle-cbl ?+ | |
54 "*Character `picture-draw-rectangle' uses for bottom left corners." | |
55 :type 'character | |
56 :group 'picture) | |
57 (defcustom picture-rectangle-v ?| | |
58 "*Character `picture-draw-rectangle' uses for vertical lines." | |
59 :type 'character | |
60 :group 'picture) | |
61 (defcustom picture-rectangle-h ?- | |
62 "*Character `picture-draw-rectangle' uses for horizontal lines." | |
63 :type 'character | |
64 :group 'picture) | |
65 | |
238 | 66 |
67 ;; Picture Movement Commands | |
68 | |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
69 ;; 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
|
70 ;; 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
|
71 ;; which may be different from (current-column). |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
72 (defvar picture-desired-column 0) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
73 |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
74 ;; 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
|
75 ;; 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
|
76 ;; current column. Return the current column. |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
77 (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
|
78 (let ((current-column (current-column))) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
79 (if (or adjust-to-current |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
80 (< picture-desired-column (1- current-column)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
81 (> picture-desired-column (1+ current-column))) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
82 (setq picture-desired-column current-column)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
83 current-column)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
84 |
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
|
85 (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
|
86 "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
|
87 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
|
88 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
|
89 (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
|
90 (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
|
91 (beginning-of-line) |
25106
bfdfc5515d48
(picture-beginning-of-line): Don't call
Dave Love <fx@gnu.org>
parents:
23756
diff
changeset
|
92 (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
|
93 |
238 | 94 (defun picture-end-of-line (&optional arg) |
95 "Position point after last non-blank character on current line. | |
96 With ARG not nil, move forward ARG - 1 lines first. | |
97 If scan reaches end of buffer, stop there without error." | |
98 (interactive "P") | |
99 (if arg (forward-line (1- (prefix-numeric-value arg)))) | |
100 (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
|
101 (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
|
102 (setq picture-desired-column (current-column))) |
238 | 103 |
43779
6f750829ab0a
(picture-forward-column): New arg `interactive'
Richard M. Stallman <rms@gnu.org>
parents:
41771
diff
changeset
|
104 (defun picture-forward-column (arg &optional interactive) |
238 | 105 "Move cursor right, making whitespace if necessary. |
106 With argument, move that many columns." | |
43779
6f750829ab0a
(picture-forward-column): New arg `interactive'
Richard M. Stallman <rms@gnu.org>
parents:
41771
diff
changeset
|
107 (interactive "p\nd") |
46103
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
108 (let (deactivate-mark) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
109 (picture-update-desired-column interactive) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
110 (setq picture-desired-column (max 0 (+ picture-desired-column arg))) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
111 (let ((current-column (move-to-column picture-desired-column t))) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
112 (if (and (> current-column picture-desired-column) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
113 (< arg 0)) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
114 ;; 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
|
115 ;; column of a multi-column character. |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
116 (forward-char -1))))) |
238 | 117 |
43779
6f750829ab0a
(picture-forward-column): New arg `interactive'
Richard M. Stallman <rms@gnu.org>
parents:
41771
diff
changeset
|
118 (defun picture-backward-column (arg &optional interactive) |
238 | 119 "Move cursor left, making whitespace if necessary. |
120 With argument, move that many columns." | |
43779
6f750829ab0a
(picture-forward-column): New arg `interactive'
Richard M. Stallman <rms@gnu.org>
parents:
41771
diff
changeset
|
121 (interactive "p\nd") |
6f750829ab0a
(picture-forward-column): New arg `interactive'
Richard M. Stallman <rms@gnu.org>
parents:
41771
diff
changeset
|
122 (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
|
123 (picture-forward-column (- arg))) |
238 | 124 |
125 (defun picture-move-down (arg) | |
126 "Move vertically down, making whitespace if necessary. | |
127 With argument, move that many lines." | |
128 (interactive "p") | |
46103
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
129 (let (deactivate-mark) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
130 (picture-update-desired-column nil) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
131 (picture-newline arg) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
132 (let ((current-column (move-to-column picture-desired-column t))) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
133 (if (> current-column picture-desired-column) |
4bea2ef4c58a
(picture-forward-column)
Richard M. Stallman <rms@gnu.org>
parents:
43906
diff
changeset
|
134 (forward-char -1))))) |
238 | 135 |
41302
65b9b5655f50
(picture-vertical-step)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39891
diff
changeset
|
136 (defvar picture-vertical-step 0 |
238 | 137 "Amount to move vertically after text character in Picture mode.") |
138 | |
41302
65b9b5655f50
(picture-vertical-step)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39891
diff
changeset
|
139 (defvar picture-horizontal-step 1 |
238 | 140 "Amount to move horizontally after text character in Picture mode.") |
141 | |
142 (defun picture-move-up (arg) | |
143 "Move vertically up, making whitespace if necessary. | |
144 With argument, move that many lines." | |
145 (interactive "p") | |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
146 (picture-update-desired-column nil) |
238 | 147 (picture-move-down (- arg))) |
148 | |
149 (defun picture-movement-right () | |
150 "Move right after self-inserting character in Picture mode." | |
151 (interactive) | |
152 (picture-set-motion 0 1)) | |
153 | |
154 (defun picture-movement-left () | |
155 "Move left after self-inserting character in Picture mode." | |
156 (interactive) | |
157 (picture-set-motion 0 -1)) | |
158 | |
159 (defun picture-movement-up () | |
160 "Move up after self-inserting character in Picture mode." | |
161 (interactive) | |
162 (picture-set-motion -1 0)) | |
163 | |
164 (defun picture-movement-down () | |
165 "Move down after self-inserting character in Picture mode." | |
166 (interactive) | |
167 (picture-set-motion 1 0)) | |
168 | |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
169 (defun picture-movement-nw (&optional arg) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
170 "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
|
171 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
|
172 (interactive "P") |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
173 (picture-set-motion -1 (if arg -2 -1))) |
238 | 174 |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
175 (defun picture-movement-ne (&optional arg) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
176 "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
|
177 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
|
178 (interactive "P") |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
179 (picture-set-motion -1 (if arg 2 1))) |
238 | 180 |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
181 (defun picture-movement-sw (&optional arg) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
182 "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
|
183 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
|
184 (interactive "P") |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
185 (picture-set-motion 1 (if arg -2 -1))) |
238 | 186 |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
187 (defun picture-movement-se (&optional arg) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
188 "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
|
189 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
|
190 (interactive "P") |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
191 (picture-set-motion 1 (if arg 2 1))) |
238 | 192 |
193 (defun picture-set-motion (vert horiz) | |
194 "Set VERTICAL and HORIZONTAL increments for movement in Picture mode. | |
195 The mode line is updated to reflect the current direction." | |
196 (setq picture-vertical-step vert | |
197 picture-horizontal-step horiz) | |
198 (setq mode-name | |
199 (format "Picture:%s" | |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
200 (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
|
201 '(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
|
202 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
|
203 (force-mode-line-update) |
238 | 204 (message "")) |
205 | |
206 (defun picture-move () | |
207 "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
|
208 (if (/= picture-vertical-step 0) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
209 (picture-move-down picture-vertical-step)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
210 (if (/= picture-horizontal-step 0) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
211 (picture-forward-column picture-horizontal-step))) |
238 | 212 |
213 (defun picture-motion (arg) | |
214 "Move point in direction of current picture motion in Picture mode. | |
215 With ARG do it that many times. Useful for delineating rectangles in | |
216 conjunction with diagonal picture motion. | |
217 Do \\[command-apropos] picture-movement to see commands which control motion." | |
218 (interactive "p") | |
219 (picture-move-down (* arg picture-vertical-step)) | |
220 (picture-forward-column (* arg picture-horizontal-step))) | |
221 | |
222 (defun picture-motion-reverse (arg) | |
223 "Move point in direction opposite of current picture motion in Picture mode. | |
224 With ARG do it that many times. Useful for delineating rectangles in | |
225 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
|
226 Do \\[command-apropos] picture-movement to see commands which control motion." |
238 | 227 (interactive "p") |
228 (picture-motion (- arg))) | |
229 | |
48014
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
230 (defun picture-mouse-set-point (event) |
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
231 "Move point to the position clicked on, making whitespace if necessary." |
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
232 (interactive "e") |
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
233 (let* ((pos (posn-col-row (event-start event))) |
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
234 (x (car pos)) |
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
235 (y (cdr pos)) |
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
236 (current-row (count-lines (window-start) (line-beginning-position)))) |
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
237 (unless (equal x (current-column)) |
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
238 (picture-forward-column (- x (current-column)))) |
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
239 (unless (equal y current-row) |
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
240 (picture-move-down (- y current-row))))) |
fc643b6ab4f4
* textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents:
46103
diff
changeset
|
241 |
238 | 242 |
243 ;; Picture insertion and deletion. | |
244 | |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
245 (defun picture-insert (ch arg) |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
246 (let* ((width (char-width ch)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
247 ;; 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
|
248 ;; the just inserted character. |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
249 (picture-horizontal-step |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
250 (if (and (= picture-vertical-step 0) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
251 (> width 1) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
252 (< (abs picture-horizontal-step) 2)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
253 (* picture-horizontal-step 2) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
254 picture-horizontal-step))) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
255 (while (> arg 0) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
256 (setq arg (1- arg)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
257 (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
|
258 (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
|
259 (let ((col (+ picture-desired-column width))) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
260 (or (eolp) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
261 (let ((pos (point))) |
43906
55003e5c6707
(picture-insert, picture-clear-column, picture-draw-rectangle):
Richard M. Stallman <rms@gnu.org>
parents:
43779
diff
changeset
|
262 (move-to-column col t) |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
263 (delete-region pos (point))))) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
264 (insert ch) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
265 (forward-char -1) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
266 (picture-move)))) |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
267 |
238 | 268 (defun picture-self-insert (arg) |
269 "Insert this character in place of character previously at the cursor. | |
270 The cursor then moves in the direction you previously specified | |
271 with the commands `picture-movement-right', `picture-movement-up', etc. | |
272 Do \\[command-apropos] `picture-movement' to see those commands." | |
273 (interactive "p") | |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
274 (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
|
275 (picture-insert last-command-event arg)) ; Always a character in this case. |
238 | 276 |
277 (defun picture-clear-column (arg) | |
278 "Clear out ARG columns after point without moving." | |
279 (interactive "p") | |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
280 (let* ((original-col (current-column)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
281 (target-col (max 0 (+ original-col arg))) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
282 pos) |
43906
55003e5c6707
(picture-insert, picture-clear-column, picture-draw-rectangle):
Richard M. Stallman <rms@gnu.org>
parents:
43779
diff
changeset
|
283 (move-to-column target-col t) |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
284 (setq pos (point)) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
285 (move-to-column original-col) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
286 (delete-region pos (point)) |
238 | 287 (save-excursion |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
288 (indent-to (max target-col original-col)))) |
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
289 (setq picture-desired-column (current-column))) |
238 | 290 |
291 (defun picture-backward-clear-column (arg) | |
292 "Clear out ARG columns before point, moving back over them." | |
293 (interactive "p") | |
294 (picture-clear-column (- arg))) | |
295 | |
296 (defun picture-clear-line (arg) | |
297 "Clear out rest of line; if at end of line, advance to next line. | |
298 Cleared-out line text goes into the kill ring, as do newlines that are | |
299 advanced over. With argument, clear out (and save in kill ring) that | |
300 many lines." | |
301 (interactive "P") | |
302 (if arg | |
303 (progn | |
304 (setq arg (prefix-numeric-value arg)) | |
305 (kill-line arg) | |
306 (newline (if (> arg 0) arg (- arg)))) | |
307 (if (looking-at "[ \t]*$") | |
308 (kill-ring-save (point) (progn (forward-line 1) (point))) | |
309 (kill-region (point) (progn (end-of-line) (point)))))) | |
310 | |
311 (defun picture-newline (arg) | |
312 "Move to the beginning of the following line. | |
313 With argument, moves that many lines (up, if negative argument); | |
314 always moves to the beginning of a line." | |
315 (interactive "p") | |
316 (if (< arg 0) | |
317 (forward-line arg) | |
318 (while (> arg 0) | |
319 (end-of-line) | |
320 (if (eobp) (newline) (forward-char 1)) | |
25106
bfdfc5515d48
(picture-beginning-of-line): Don't call
Dave Love <fx@gnu.org>
parents:
23756
diff
changeset
|
321 (setq arg (1- arg))))) |
238 | 322 |
323 (defun picture-open-line (arg) | |
324 "Insert an empty line after the current line. | |
325 With positive argument insert that many lines." | |
326 (interactive "p") | |
327 (save-excursion | |
328 (end-of-line) | |
25106
bfdfc5515d48
(picture-beginning-of-line): Don't call
Dave Love <fx@gnu.org>
parents:
23756
diff
changeset
|
329 (open-line arg))) |
238 | 330 |
331 (defun picture-duplicate-line () | |
332 "Insert a duplicate of the current line, below it." | |
333 (interactive) | |
334 (save-excursion | |
335 (let ((contents | |
336 (buffer-substring | |
337 (progn (beginning-of-line) (point)) | |
338 (progn (picture-newline 1) (point))))) | |
339 (forward-line -1) | |
340 (insert contents)))) | |
341 | |
3730
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
342 ;; Like replace-match, but overwrites. |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
343 (defun picture-replace-match (newtext fixedcase literal) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
344 (let (ocolumn change pos) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
345 (goto-char (setq pos (match-end 0))) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
346 (setq ocolumn (current-column)) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
347 ;; 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
|
348 (let ((buffer-undo-list nil) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
349 list1) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
350 (replace-match newtext fixedcase literal) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
351 (setq change (- (current-column) ocolumn)) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
352 (setq list1 buffer-undo-list) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
353 (while list1 |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
354 (setq list1 (primitive-undo 1 list1)))) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
355 (goto-char pos) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
356 (if (> change 0) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
357 (delete-region (point) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
358 (progn |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
359 (move-to-column (+ change (current-column)) t) |
3730
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
360 (point)))) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
361 (replace-match newtext fixedcase literal) |
473c03886fc2
(picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents:
3643
diff
changeset
|
362 (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
|
363 (insert-char ?\s (- change))))) |
238 | 364 |
365 ;; Picture Tabs | |
366 | |
20959 | 367 (defcustom picture-tab-chars "!-~" |
368 "*A character set which controls behavior of commands. | |
238 | 369 \\[picture-set-tab-stops] and \\[picture-tab-search]. It is NOT a |
370 regular expression, any regexp special characters will be quoted. | |
371 It defines a set of \"interesting characters\" to look for when setting | |
372 \(or searching for) tab stops, initially \"!-~\" (all printing characters). | |
373 For example, suppose that you are editing a table which is formatted thus: | |
374 | foo | bar + baz | 23 * | |
375 | bubbles | and + etc | 97 * | |
376 and that `picture-tab-chars' is \"|+*\". Then invoking | |
377 \\[picture-set-tab-stops] on either of the previous lines would result | |
378 in the following tab stops | |
379 : : : : | |
380 Another example - \"A-Za-z0-9\" would produce the tab stops | |
381 : : : : | |
382 | |
383 Note that if you want the character `-' to be in the set, it must be | |
384 included in a range or else appear in a context where it cannot be | |
385 taken for indicating a range (e.g. \"-A-Z\" declares the set to be the | |
386 letters `A' through `Z' and the character `-'). If you want the | |
387 character `\\' in the set it must be preceded by itself: \"\\\\\". | |
388 | |
389 The command \\[picture-tab-search] is defined to move beneath (or to) a | |
20959 | 390 character belonging to this set independent of the tab stops list." |
391 :type 'string | |
392 :group 'picture) | |
238 | 393 |
394 (defun picture-set-tab-stops (&optional arg) | |
395 "Set value of `tab-stop-list' according to context of this line. | |
396 This controls the behavior of \\[picture-tab]. A tab stop is set at | |
397 every column occupied by an \"interesting character\" that is preceded | |
398 by whitespace. Interesting characters are defined by the variable | |
399 `picture-tab-chars', see its documentation for an example of usage. | |
400 With ARG, just (re)set `tab-stop-list' to its default value. The tab | |
401 stops computed are displayed in the minibuffer with `:' at each stop." | |
402 (interactive "P") | |
403 (save-excursion | |
404 (let (tabs) | |
405 (if arg | |
406 (setq tabs (default-value 'tab-stop-list)) | |
407 (let ((regexp (concat "[ \t]+[" (regexp-quote picture-tab-chars) "]"))) | |
408 (beginning-of-line) | |
409 (let ((bol (point))) | |
410 (end-of-line) | |
411 (while (re-search-backward regexp bol t) | |
412 (skip-chars-forward " \t") | |
413 (setq tabs (cons (current-column) tabs))) | |
414 (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
|
415 (error "No characters in set %s on this line" |
238 | 416 (regexp-quote picture-tab-chars)))))) |
417 (setq tab-stop-list tabs) | |
418 (let ((blurb (make-string (1+ (nth (1- (length tabs)) tabs)) ?\ ))) | |
419 (while tabs | |
420 (aset blurb (car tabs) ?:) | |
421 (setq tabs (cdr tabs))) | |
422 (message blurb))))) | |
423 | |
424 (defun picture-tab-search (&optional arg) | |
425 "Move to column beneath next interesting char in previous line. | |
426 With ARG move to column occupied by next interesting character in this | |
427 line. The character must be preceded by whitespace. | |
428 \"interesting characters\" are defined by variable `picture-tab-chars'. | |
429 If no such character is found, move to beginning of line." | |
430 (interactive "P") | |
431 (let ((target (current-column))) | |
432 (save-excursion | |
433 (if (and (not arg) | |
434 (progn | |
435 (beginning-of-line) | |
436 (skip-chars-backward | |
437 (concat "^" (regexp-quote picture-tab-chars)) | |
438 (point-min)) | |
439 (not (bobp)))) | |
440 (move-to-column target)) | |
441 (if (re-search-forward | |
442 (concat "[ \t]+[" (regexp-quote picture-tab-chars) "]") | |
443 (save-excursion (end-of-line) (point)) | |
444 'move) | |
445 (setq target (1- (current-column))) | |
446 (setq target nil))) | |
447 (if target | |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
448 (move-to-column target t) |
238 | 449 (beginning-of-line)))) |
450 | |
451 (defun picture-tab (&optional arg) | |
452 "Tab transparently (just move point) to next tab stop. | |
453 With prefix arg, overwrite the traversed text with spaces. The tab stop | |
454 list can be changed by \\[picture-set-tab-stops] and \\[edit-tab-stops]. | |
455 See also documentation for variable `picture-tab-chars'." | |
456 (interactive "P") | |
457 (let* ((opoint (point))) | |
458 (move-to-tab-stop) | |
459 (if arg | |
460 (let (indent-tabs-mode | |
461 (column (current-column))) | |
462 (delete-region opoint (point)) | |
463 (indent-to column))))) | |
464 | |
465 ;; Picture Rectangles | |
466 | |
26078
1dfff19134ab
(picture-killed-rectangle): Use defvar, not defconst.
Dave Love <fx@gnu.org>
parents:
25106
diff
changeset
|
467 (defvar picture-killed-rectangle nil |
238 | 468 "Rectangle killed or copied by \\[picture-clear-rectangle] in Picture mode. |
469 The contents can be retrieved by \\[picture-yank-rectangle]") | |
470 | |
471 (defun picture-clear-rectangle (start end &optional killp) | |
472 "Clear and save rectangle delineated by point and mark. | |
473 The rectangle is saved for yanking by \\[picture-yank-rectangle] and replaced | |
474 with whitespace. The previously saved rectangle, if any, is lost. With | |
475 prefix argument, the rectangle is actually killed, shifting remaining text." | |
476 (interactive "r\nP") | |
477 (setq picture-killed-rectangle (picture-snarf-rectangle start end killp))) | |
478 | |
479 (defun picture-clear-rectangle-to-register (start end register &optional killp) | |
480 "Clear rectangle delineated by point and mark into REGISTER. | |
481 The rectangle is saved in REGISTER and replaced with whitespace. With | |
482 prefix argument, the rectangle is actually killed, shifting remaining text." | |
483 (interactive "r\ncRectangle to register: \nP") | |
484 (set-register register (picture-snarf-rectangle start end killp))) | |
485 | |
486 (defun picture-snarf-rectangle (start end &optional killp) | |
487 (let ((column (current-column)) | |
488 (indent-tabs-mode nil)) | |
489 (prog1 (save-excursion | |
490 (if killp | |
491 (delete-extract-rectangle start end) | |
492 (prog1 (extract-rectangle start end) | |
493 (clear-rectangle start end)))) | |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
494 (move-to-column column t)))) |
238 | 495 |
496 (defun picture-yank-rectangle (&optional insertp) | |
497 "Overlay rectangle saved by \\[picture-clear-rectangle] | |
498 The rectangle is positioned with upper left corner at point, overwriting | |
499 existing text. With prefix argument, the rectangle is inserted instead, | |
500 shifting existing text. Leaves mark at one corner of rectangle and | |
501 point at the other (diagonally opposed) corner." | |
502 (interactive "P") | |
503 (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
|
504 (error "No rectangle saved") |
238 | 505 (picture-insert-rectangle picture-killed-rectangle insertp))) |
506 | |
8915
991438f3f39a
(picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
507 (defun picture-yank-at-click (click arg) |
991438f3f39a
(picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
508 "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
|
509 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
|
510 Prefix arguments are interpreted as with \\[yank]. |
991438f3f39a
(picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
511 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
|
512 regardless of where you click." |
991438f3f39a
(picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
513 (interactive "e\nP") |
991438f3f39a
(picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
514 (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
|
515 (picture-yank-rectangle arg)) |
991438f3f39a
(picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents:
7300
diff
changeset
|
516 |
238 | 517 (defun picture-yank-rectangle-from-register (register &optional insertp) |
518 "Overlay rectangle saved in REGISTER. | |
519 The rectangle is positioned with upper left corner at point, overwriting | |
520 existing text. With prefix argument, the rectangle is | |
521 inserted instead, shifting existing text. Leaves mark at one corner | |
522 of rectangle and point at the other (diagonally opposed) corner." | |
523 (interactive "cRectangle from register: \nP") | |
524 (let ((rectangle (get-register register))) | |
525 (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
|
526 (error "Register %c does not contain a rectangle" register) |
238 | 527 (picture-insert-rectangle rectangle insertp)))) |
528 | |
529 (defun picture-insert-rectangle (rectangle &optional insertp) | |
530 "Overlay RECTANGLE with upper left corner at point. | |
531 Optional argument INSERTP, if non-nil causes RECTANGLE to be inserted. | |
532 Leaves the region surrounding the rectangle." | |
533 (let ((indent-tabs-mode nil)) | |
534 (if (not insertp) | |
535 (save-excursion | |
536 (delete-rectangle (point) | |
537 (progn | |
538 (picture-forward-column (length (car rectangle))) | |
539 (picture-move-down (1- (length rectangle))) | |
540 (point))))) | |
541 (push-mark) | |
542 (insert-rectangle rectangle))) | |
543 | |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
544 (defun picture-current-line () |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
545 "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
|
546 (+ (count-lines (point-min) (point)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
547 (if (= (current-column) 0) 1 0))) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
548 |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
549 (defun picture-draw-rectangle (start end) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
550 "Draw a rectangle around region." |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
551 (interactive "*r") ; start will be less than end |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
552 (let* ((sl (picture-current-line)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
553 (sc (current-column)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
554 (pvs picture-vertical-step) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
555 (phs picture-horizontal-step) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
556 (c1 (progn (goto-char start) (current-column))) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
557 (r1 (picture-current-line)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
558 (c2 (progn (goto-char end) (current-column))) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
559 (r2 (picture-current-line)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
560 (right (max c1 c2)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
561 (left (min c1 c2)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
562 (top (min r1 r2)) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
563 (bottom (max r1 r2))) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
564 (goto-line top) |
43906
55003e5c6707
(picture-insert, picture-clear-column, picture-draw-rectangle):
Richard M. Stallman <rms@gnu.org>
parents:
43779
diff
changeset
|
565 (move-to-column left t) |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
566 (picture-update-desired-column t) |
18412
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
567 |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
568 (picture-movement-right) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
569 (picture-insert picture-rectangle-ctl 1) |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
570 (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
|
571 |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
572 (picture-movement-down) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
573 (picture-insert picture-rectangle-ctr 1) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
574 (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
|
575 |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
576 (picture-movement-left) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
577 (picture-insert picture-rectangle-cbr 1) |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
578 (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
|
579 |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
580 (picture-movement-up) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
581 (picture-insert picture-rectangle-cbl 1) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
582 (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
|
583 |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
584 (picture-set-motion pvs phs) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
585 (goto-line sl) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
586 (move-to-column sc t))) |
3febbe908cc3
(picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents:
14567
diff
changeset
|
587 |
238 | 588 |
589 ;; Picture Keymap, entry and exit points. | |
590 | |
41771
66882a00d38d
(picture-mode-map): Don't use defconst for a variable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41302
diff
changeset
|
591 (defvar picture-mode-map nil) |
238 | 592 |
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
|
593 (defun picture-substitute (oldfun newfun) |
49177
f47ff7e8f5f5
(picture-substitute): Use command remapping instead of
Andreas Schwab <schwab@suse.de>
parents:
48014
diff
changeset
|
594 (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
|
595 |
238 | 596 (if (not picture-mode-map) |
10018
2c6b612b358c
(picture-self-insert): Use last-command-event,
Richard M. Stallman <rms@gnu.org>
parents:
8915
diff
changeset
|
597 (progn |
23756
7a9b0b88448e
Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents:
20959
diff
changeset
|
598 (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
|
599 (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
|
600 (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
|
601 'picture-self-insert) |
94dd08880c3b
(picture-mode-map): Install picture-self-insert
Richard M. Stallman <rms@gnu.org>
parents:
14324
diff
changeset
|
602 (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
|
603 '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
|
604 (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
|
605 (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
|
606 (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
|
607 ;; 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
|
608 (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
|
609 (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
|
610 (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
|
611 (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
|
612 (picture-substitute 'newline 'picture-newline) |
10018
2c6b612b358c
(picture-self-insert): Use last-command-event,
Richard M. Stallman <rms@gnu.org>
parents:
8915
diff
changeset
|
613 (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
|
614 (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
|
615 (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
|
616 (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
|
617 (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
|
618 (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
|
619 |
238 | 620 (define-key picture-mode-map "\C-c\C-d" 'delete-char) |
621 (define-key picture-mode-map "\e\t" 'picture-toggle-tab-state) | |
622 (define-key picture-mode-map "\t" 'picture-tab) | |
623 (define-key picture-mode-map "\e\t" 'picture-tab-search) | |
624 (define-key picture-mode-map "\C-c\t" 'picture-set-tab-stops) | |
625 (define-key picture-mode-map "\C-c\C-k" 'picture-clear-rectangle) | |
626 (define-key picture-mode-map "\C-c\C-w" 'picture-clear-rectangle-to-register) | |
627 (define-key picture-mode-map "\C-c\C-y" 'picture-yank-rectangle) | |
628 (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
|
629 (define-key picture-mode-map "\C-c\C-r" 'picture-draw-rectangle) |
238 | 630 (define-key picture-mode-map "\C-c\C-c" 'picture-mode-exit) |
631 (define-key picture-mode-map "\C-c\C-f" 'picture-motion) | |
632 (define-key picture-mode-map "\C-c\C-b" 'picture-motion-reverse) | |
633 (define-key picture-mode-map "\C-c<" 'picture-movement-left) | |
634 (define-key picture-mode-map "\C-c>" 'picture-movement-right) | |
635 (define-key picture-mode-map "\C-c^" 'picture-movement-up) | |
636 (define-key picture-mode-map "\C-c." 'picture-movement-down) | |
637 (define-key picture-mode-map "\C-c`" 'picture-movement-nw) | |
638 (define-key picture-mode-map "\C-c'" 'picture-movement-ne) | |
639 (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
|
640 (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
|
641 (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
|
642 (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
|
643 (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
|
644 (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
|
645 (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
|
646 (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
|
647 (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
|
648 (define-key picture-mode-map [(control ?c) next] 'picture-movement-se))) |
238 | 649 |
20959 | 650 (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
|
651 "If non-nil, its value is called on entry to Picture mode. |
20959 | 652 Picture mode is invoked by the command \\[picture-mode]." |
653 :type 'hook | |
654 :group 'picture) | |
238 | 655 |
875 | 656 (defvar picture-mode-old-local-map) |
657 (defvar picture-mode-old-mode-name) | |
658 (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
|
659 (defvar picture-mode-old-truncate-lines) |
875 | 660 |
256 | 661 ;;;###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
|
662 (defun picture-mode () |
238 | 663 "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
|
664 \\<picture-mode-map> |
238 | 665 Printing characters replace instead of inserting themselves with motion |
666 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
|
667 |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
668 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
|
669 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
|
670 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
|
671 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
|
672 |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
673 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
|
674 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
|
675 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
|
676 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
|
677 |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
678 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
|
679 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
|
680 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
|
681 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
|
682 |
238 | 683 The current direction is displayed in the mode line. The initial |
684 direction is right. Whitespace is inserted and tabs are changed to | |
685 spaces when required by movement. You can move around in the buffer | |
686 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
|
687 |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
688 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
|
689 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
|
690 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
|
691 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
|
692 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
|
693 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
|
694 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
|
695 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
|
696 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
|
697 |
238 | 698 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
|
699 |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
700 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
|
701 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
|
702 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
|
703 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
|
704 (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
|
705 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
|
706 |
238 | 707 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
|
708 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
|
709 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
|
710 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
|
711 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
|
712 (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
|
713 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
|
714 |
238 | 715 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
|
716 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
|
717 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
|
718 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
|
719 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
|
720 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
|
721 Copies a rectangle to a register: \\[copy-rectangle-to-register] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
722 Undo effects of rectangle overlay commands: \\[advertised-undo] |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
723 |
585a898592ba
* language/ethio-util.el (ethio-fidel-to-sera-mail-or-marker):
Chong Yidong <cyd@stupidchicken.com>
parents:
64751
diff
changeset
|
724 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
|
725 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
|
726 by supplying an argument. |
238 | 727 |
39891
34c05876ce21
(picture-mode): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38479
diff
changeset
|
728 Entry to this mode calls the value of `picture-mode-hook' if non-nil. |
238 | 729 |
730 Note that Picture mode commands will work outside of Picture mode, but | |
731 they are not defaultly assigned to keys." | |
732 (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
|
733 (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
|
734 (error "You are already editing a picture") |
39891
34c05876ce21
(picture-mode): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38479
diff
changeset
|
735 (set (make-local-variable 'picture-mode-old-local-map) (current-local-map)) |
238 | 736 (use-local-map picture-mode-map) |
39891
34c05876ce21
(picture-mode): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38479
diff
changeset
|
737 (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
|
738 (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
|
739 (setq major-mode 'picture-mode) |
39891
34c05876ce21
(picture-mode): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38479
diff
changeset
|
740 (set (make-local-variable 'picture-killed-rectangle) nil) |
34c05876ce21
(picture-mode): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38479
diff
changeset
|
741 (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
|
742 (set (make-local-variable 'picture-tab-chars) |
34c05876ce21
(picture-mode): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38479
diff
changeset
|
743 (default-value 'picture-tab-chars)) |
238 | 744 (make-local-variable 'picture-vertical-step) |
745 (make-local-variable 'picture-horizontal-step) | |
39891
34c05876ce21
(picture-mode): Massage.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38479
diff
changeset
|
746 (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
|
747 (setq truncate-lines t) |
238 | 748 (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
|
749 |
1396
17365cdb1c10
(edit-picture): Run picture-mode-hook.
Richard M. Stallman <rms@gnu.org>
parents:
875
diff
changeset
|
750 ;; 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
|
751 (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
|
752 (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
|
753 (substitute-command-keys "\\[picture-mode-exit]") |
fae2e1075bcf
(picture-mode): Pass proper format string to message.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
754 picture-mode-old-mode-name))) |
238 | 755 |
269 | 756 ;;;###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
|
757 (defalias 'edit-picture 'picture-mode) |
238 | 758 |
759 (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
|
760 "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
|
761 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
|
762 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
|
763 Runs `picture-mode-exit-hook' at the end." |
238 | 764 (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
|
765 (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
|
766 (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
|
767 (if (not nostrip) (delete-trailing-whitespace)) |
238 | 768 (setq mode-name picture-mode-old-mode-name) |
769 (use-local-map picture-mode-old-local-map) | |
770 (setq major-mode picture-mode-old-major-mode) | |
771 (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
|
772 (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
|
773 (force-mode-line-update) |
b45b825f9e2a
(picture-mode-exit): Run picture-mode-exit-hook.
Richard M. Stallman <rms@gnu.org>
parents:
68648
diff
changeset
|
774 (run-hooks 'picture-mode-exit-hook))) |
238 | 775 |
584 | 776 (provide 'picture) |
777 | |
52401 | 778 ;;; arch-tag: e452d08d-a470-4fbf-896e-ea276698d1ca |
659
505130d1ddf8
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
584
diff
changeset
|
779 ;;; picture.el ends here |