annotate lisp/textmodes/picture.el @ 111429:249a1455856a

Use line-end-position rather than end-of-line, etc. * textmodes/texnfo-upd.el (texinfo-start-menu-description) (texinfo-update-menu-region-beginning, texinfo-menu-first-node) (texinfo-delete-existing-pointers, texinfo-find-pointer) (texinfo-clean-up-node-line, texinfo-insert-node-lines) (texinfo-multiple-files-update): * textmodes/table.el (table--probe-cell-left-up) (table--probe-cell-right-bottom): * textmodes/picture.el (picture-tab-search): * textmodes/page-ext.el (pages-copy-header-and-position) (pages-directory-for-addresses): * progmodes/vera-mode.el (vera-get-offset): * progmodes/simula.el (simula-calculate-indent): * progmodes/python.el (python-pdbtrack-overlay-arrow): * progmodes/prolog.el (end-of-prolog-clause): * progmodes/perl-mode.el (perl-calculate-indent, perl-indent-exp): * progmodes/icon.el (indent-icon-exp): * progmodes/etags.el (tag-re-match-p): * progmodes/ebrowse.el (ebrowse-show-file-name-at-point): * progmodes/ebnf2ps.el (ebnf-begin-file): * progmodes/dcl-mode.el (dcl-back-to-indentation-1) (dcl-save-local-variable): * play/life.el (life-setup): * play/gametree.el (gametree-looking-at-ply): * nxml/nxml-maint.el (nxml-insert-target-repertoire-glyph-set): * mail/sendmail.el (mail-mode-auto-fill): * emacs-lisp/lisp-mode.el (calculate-lisp-indent): * emacs-lisp/edebug.el (edebug-overlay-arrow): * emacs-lisp/checkdoc.el (checkdoc-this-string-valid): * woman.el (woman-parse-numeric-value, woman2-TH, woman2-SH) (woman-tab-to-tab-stop, WoMan-warn-ignored): * type-break.el (type-break-file-keystroke-count): * term.el (term-replace-by-expanded-history-before-point) (term-skip-prompt, term-extract-string): * speedbar.el (speedbar-edit-line, speedbar-expand-line) (speedbar-contract-line, speedbar-toggle-line-expansion) (speedbar-parse-c-or-c++tag, speedbar-parse-tex-string) (speedbar-buffer-revert-buffer, speedbar-highlight-one-tag-line): * sort.el (sort-skip-fields): * skeleton.el (skeleton-internal-list): * simple.el (line-move-finish, line-move-to-column): * shell.el (shell-forward-command): * misc.el (copy-from-above-command): * makesum.el (double-column): * ebuff-menu.el (electric-buffer-update-highlight): * dired.el (dired-move-to-end-of-filename): * dframe.el (dframe-popup-kludge): * bookmark.el (bookmark-kill-line, bookmark-bmenu-show-filenames): * arc-mode.el (archive-get-lineno): Use line-end-position and line-beginning-position. * net/ange-ftp.el, progmodes/hideif.el, reposition.el: Same, but only in comments.
author Glenn Morris <rgm@gnu.org>
date Sat, 06 Nov 2010 13:23:42 -0700
parents 7c4da622f181
children 3655cc4062e4
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 104922
diff changeset
4 ;; 2008, 2009, 2010 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
78498d8ae698 Add Keywords header.
Dave Love <fx@gnu.org>
parents: 33786
diff changeset
8 ;; Keywords: convenience wp
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
9
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
10 ;; This file is part of GNU Emacs.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
16
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
20 ;; GNU General Public License for more details.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
21
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
33
20959
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
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
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
36 :prefix "picture-"
107378
904ccd8f2acb Reorganize Custom groups.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
37 :group 'wp)
20959
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
38
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
39 (defcustom picture-rectangle-ctl ?+
110494
7c4da622f181 Remove leading `*' from docs of some defcustoms etc.
Glenn Morris <rgm@gnu.org>
parents: 107378
diff changeset
40 "Character `picture-draw-rectangle' uses for top left corners."
20959
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
41 :type 'character
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
42 :group 'picture)
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
43 (defcustom picture-rectangle-ctr ?+
110494
7c4da622f181 Remove leading `*' from docs of some defcustoms etc.
Glenn Morris <rgm@gnu.org>
parents: 107378
diff changeset
44 "Character `picture-draw-rectangle' uses for top right corners."
20959
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
45 :type 'character
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
46 :group 'picture)
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
47 (defcustom picture-rectangle-cbr ?+
110494
7c4da622f181 Remove leading `*' from docs of some defcustoms etc.
Glenn Morris <rgm@gnu.org>
parents: 107378
diff changeset
48 "Character `picture-draw-rectangle' uses for bottom right corners."
20959
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
49 :type 'character
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
50 :group 'picture)
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
51 (defcustom picture-rectangle-cbl ?+
110494
7c4da622f181 Remove leading `*' from docs of some defcustoms etc.
Glenn Morris <rgm@gnu.org>
parents: 107378
diff changeset
52 "Character `picture-draw-rectangle' uses for bottom left corners."
20959
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
53 :type 'character
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
54 :group 'picture)
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
55 (defcustom picture-rectangle-v ?|
110494
7c4da622f181 Remove leading `*' from docs of some defcustoms etc.
Glenn Morris <rgm@gnu.org>
parents: 107378
diff changeset
56 "Character `picture-draw-rectangle' uses for vertical lines."
20959
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
57 :type 'character
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
58 :group 'picture)
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
59 (defcustom picture-rectangle-h ?-
110494
7c4da622f181 Remove leading `*' from docs of some defcustoms etc.
Glenn Morris <rgm@gnu.org>
parents: 107378
diff changeset
60 "Character `picture-draw-rectangle' uses for horizontal lines."
20959
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
61 :type 'character
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
62 :group 'picture)
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
63
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
64
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
65 ;; Picture Movement Commands
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
92 (defun picture-end-of-line (&optional arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
93 "Position point after last non-blank character on current line.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
94 With ARG not nil, move forward ARG - 1 lines first.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
95 If scan reaches end of buffer, stop there without error."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
96 (interactive "P")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
97 (if arg (forward-line (1- (prefix-numeric-value arg))))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
103 "Move cursor right, making whitespace if necessary.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
117 "Move cursor left, making whitespace if necessary.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
122
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
123 (defun picture-move-down (arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
124 "Move vertically down, making whitespace if necessary.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
125 With argument, move that many lines."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
133
41302
65b9b5655f50 (picture-vertical-step)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39891
diff changeset
134 (defvar picture-vertical-step 0
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
135 "Amount to move vertically after text character in Picture mode.")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
136
41302
65b9b5655f50 (picture-vertical-step)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39891
diff changeset
137 (defvar picture-horizontal-step 1
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
138 "Amount to move horizontally after text character in Picture mode.")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
139
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
140 (defun picture-move-up (arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
141 "Move vertically up, making whitespace if necessary.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
142 With argument, move that many lines."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
145 (picture-move-down (- arg)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
146
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
147 (defun picture-movement-right ()
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
148 "Move right after self-inserting character in Picture mode."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
149 (interactive)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
150 (picture-set-motion 0 1))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
151
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
152 (defun picture-movement-left ()
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
153 "Move left after self-inserting character in Picture mode."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
154 (interactive)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
155 (picture-set-motion 0 -1))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
156
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
157 (defun picture-movement-up ()
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
158 "Move up after self-inserting character in Picture mode."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
159 (interactive)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
160 (picture-set-motion -1 0))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
161
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
162 (defun picture-movement-down ()
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
163 "Move down after self-inserting character in Picture mode."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
164 (interactive)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
165 (picture-set-motion 1 0))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
190
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
191 (defun picture-set-motion (vert horiz)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
192 "Set VERTICAL and HORIZONTAL increments for movement in Picture mode.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
193 The mode line is updated to reflect the current direction."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
194 (setq picture-vertical-step vert
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
195 picture-horizontal-step horiz)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
196 (setq mode-name
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
202 (message ""))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
203
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
204 (defun picture-move ()
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
210
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
211 (defun picture-motion (arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
212 "Move point in direction of current picture motion in Picture mode.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
213 With ARG do it that many times. Useful for delineating rectangles in
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
214 conjunction with diagonal picture motion.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
215 Do \\[command-apropos] picture-movement to see commands which control motion."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
216 (interactive "p")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
217 (picture-move-down (* arg picture-vertical-step))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
218 (picture-forward-column (* arg picture-horizontal-step)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
219
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
220 (defun picture-motion-reverse (arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
221 "Move point in direction opposite of current picture motion in Picture mode.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
222 With ARG do it that many times. Useful for delineating rectangles in
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
225 (interactive "p")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
226 (picture-motion (- arg)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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)
fc643b6ab4f4 * textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents: 46103
diff changeset
229 "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
230 (interactive "e")
fc643b6ab4f4 * textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents: 46103
diff changeset
231 (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
232 (x (car pos))
fc643b6ab4f4 * textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents: 46103
diff changeset
233 (y (cdr pos))
fc643b6ab4f4 * textmodes/picture.el (picture-mouse-set-point): New command.
John Paul Wallington <jpw@pobox.com>
parents: 46103
diff changeset
234 (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
235 (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
236 (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
237 (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
238 (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
239
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
240
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
241 ;; Picture insertion and deletion.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
242
18412
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
243 (defun picture-insert (ch arg)
23756
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
244 (let* ((width (char-width ch))
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
245 ;; 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
246 ;; the just inserted character.
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
247 (picture-horizontal-step
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
248 (if (and (= picture-vertical-step 0)
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
249 (> width 1)
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
250 (< (abs picture-horizontal-step) 2))
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
251 (* picture-horizontal-step 2)
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
252 picture-horizontal-step)))
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
253 (while (> arg 0)
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
254 (setq arg (1- arg))
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
255 (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
256 (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
257 (let ((col (+ picture-desired-column width)))
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
258 (or (eolp)
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
259 (let ((pos (point)))
43906
55003e5c6707 (picture-insert, picture-clear-column, picture-draw-rectangle):
Richard M. Stallman <rms@gnu.org>
parents: 43779
diff changeset
260 (move-to-column col t)
23756
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
261 (delete-region pos (point)))))
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
262 (insert ch)
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
263 (forward-char -1)
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
264 (picture-move))))
18412
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
265
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
266 (defun picture-self-insert (arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
267 "Insert this character in place of character previously at the cursor.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
268 The cursor then moves in the direction you previously specified
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
269 with the commands `picture-movement-right', `picture-movement-up', etc.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
270 Do \\[command-apropos] `picture-movement' to see those commands."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
271 (interactive "p")
23756
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
272 (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
273 (picture-insert last-command-event arg)) ; Always a character in this case.
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
274
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
275 (defun picture-clear-column (arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
276 "Clear out ARG columns after point without moving."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
277 (interactive "p")
23756
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
278 (let* ((original-col (current-column))
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
279 (target-col (max 0 (+ original-col arg)))
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
280 pos)
43906
55003e5c6707 (picture-insert, picture-clear-column, picture-draw-rectangle):
Richard M. Stallman <rms@gnu.org>
parents: 43779
diff changeset
281 (move-to-column target-col t)
23756
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
282 (setq pos (point))
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
283 (move-to-column original-col)
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
284 (delete-region pos (point))
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
285 (save-excursion
23756
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
286 (indent-to (max target-col original-col))))
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
287 (setq picture-desired-column (current-column)))
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
288
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
289 (defun picture-backward-clear-column (arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
290 "Clear out ARG columns before point, moving back over them."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
291 (interactive "p")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
292 (picture-clear-column (- arg)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
293
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
294 (defun picture-clear-line (arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
295 "Clear out rest of line; if at end of line, advance to next line.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
296 Cleared-out line text goes into the kill ring, as do newlines that are
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
297 advanced over. With argument, clear out (and save in kill ring) that
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
298 many lines."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
299 (interactive "P")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
300 (if arg
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
301 (progn
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
302 (setq arg (prefix-numeric-value arg))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
303 (kill-line arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
304 (newline (if (> arg 0) arg (- arg))))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
305 (if (looking-at "[ \t]*$")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
306 (kill-ring-save (point) (progn (forward-line 1) (point)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
307 (kill-region (point) (progn (end-of-line) (point))))))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
308
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
309 (defun picture-newline (arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
310 "Move to the beginning of the following line.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
311 With argument, moves that many lines (up, if negative argument);
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
312 always moves to the beginning of a line."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
313 (interactive "p")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
314 (if (< arg 0)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
315 (forward-line arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
316 (while (> arg 0)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
317 (end-of-line)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
318 (if (eobp) (newline) (forward-char 1))
25106
bfdfc5515d48 (picture-beginning-of-line): Don't call
Dave Love <fx@gnu.org>
parents: 23756
diff changeset
319 (setq arg (1- arg)))))
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
320
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
321 (defun picture-open-line (arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
322 "Insert an empty line after the current line.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
323 With positive argument insert that many lines."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
324 (interactive "p")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
325 (save-excursion
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
326 (end-of-line)
25106
bfdfc5515d48 (picture-beginning-of-line): Don't call
Dave Love <fx@gnu.org>
parents: 23756
diff changeset
327 (open-line arg)))
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
328
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
329 (defun picture-duplicate-line ()
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
330 "Insert a duplicate of the current line, below it."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
331 (interactive)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
332 (save-excursion
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
333 (let ((contents
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
334 (buffer-substring
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
335 (progn (beginning-of-line) (point))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
336 (progn (picture-newline 1) (point)))))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
337 (forward-line -1)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
338 (insert contents))))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
339
3730
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
340 ;; Like replace-match, but overwrites.
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
341 (defun picture-replace-match (newtext fixedcase literal)
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
342 (let (ocolumn change pos)
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
343 (goto-char (setq pos (match-end 0)))
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
344 (setq ocolumn (current-column))
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
345 ;; 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
346 (let ((buffer-undo-list nil)
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
347 list1)
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
348 (replace-match newtext fixedcase literal)
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
349 (setq change (- (current-column) ocolumn))
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
350 (setq list1 buffer-undo-list)
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
351 (while list1
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
352 (setq list1 (primitive-undo 1 list1))))
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
353 (goto-char pos)
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
354 (if (> change 0)
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
355 (delete-region (point)
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
356 (progn
18412
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
357 (move-to-column (+ change (current-column)) t)
3730
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
358 (point))))
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
359 (replace-match newtext fixedcase literal)
473c03886fc2 (picture-replace-match): New function.
Richard M. Stallman <rms@gnu.org>
parents: 3643
diff changeset
360 (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
361 (insert-char ?\s (- change)))))
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
362
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
363 ;; Picture Tabs
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
364
20959
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
365 (defcustom picture-tab-chars "!-~"
110494
7c4da622f181 Remove leading `*' from docs of some defcustoms etc.
Glenn Morris <rgm@gnu.org>
parents: 107378
diff changeset
366 "A character set which controls behavior of commands.
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
367 \\[picture-set-tab-stops] and \\[picture-tab-search]. It is NOT a
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
368 regular expression, any regexp special characters will be quoted.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
369 It defines a set of \"interesting characters\" to look for when setting
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
370 \(or searching for) tab stops, initially \"!-~\" (all printing characters).
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
371 For example, suppose that you are editing a table which is formatted thus:
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
372 | foo | bar + baz | 23 *
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
373 | bubbles | and + etc | 97 *
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
374 and that `picture-tab-chars' is \"|+*\". Then invoking
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
375 \\[picture-set-tab-stops] on either of the previous lines would result
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
376 in the following tab stops
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
377 : : : :
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
378 Another example - \"A-Za-z0-9\" would produce the tab stops
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
379 : : : :
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
380
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
381 Note that if you want the character `-' to be in the set, it must be
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
382 included in a range or else appear in a context where it cannot be
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
383 taken for indicating a range (e.g. \"-A-Z\" declares the set to be the
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
384 letters `A' through `Z' and the character `-'). If you want the
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
385 character `\\' in the set it must be preceded by itself: \"\\\\\".
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
386
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
387 The command \\[picture-tab-search] is defined to move beneath (or to) a
20959
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
388 character belonging to this set independent of the tab stops list."
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
389 :type 'string
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
390 :group 'picture)
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
391
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
392 (defun picture-set-tab-stops (&optional arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
393 "Set value of `tab-stop-list' according to context of this line.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
394 This controls the behavior of \\[picture-tab]. A tab stop is set at
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
395 every column occupied by an \"interesting character\" that is preceded
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
396 by whitespace. Interesting characters are defined by the variable
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
397 `picture-tab-chars', see its documentation for an example of usage.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
398 With ARG, just (re)set `tab-stop-list' to its default value. The tab
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
399 stops computed are displayed in the minibuffer with `:' at each stop."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
400 (interactive "P")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
401 (save-excursion
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
402 (let (tabs)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
403 (if arg
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
404 (setq tabs (default-value 'tab-stop-list))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
405 (let ((regexp (concat "[ \t]+[" (regexp-quote picture-tab-chars) "]")))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
406 (beginning-of-line)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
407 (let ((bol (point)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
408 (end-of-line)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
409 (while (re-search-backward regexp bol t)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
410 (skip-chars-forward " \t")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
411 (setq tabs (cons (current-column) tabs)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
412 (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
413 (error "No characters in set %s on this line"
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
414 (regexp-quote picture-tab-chars))))))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
415 (setq tab-stop-list tabs)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
416 (let ((blurb (make-string (1+ (nth (1- (length tabs)) tabs)) ?\ )))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
417 (while tabs
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
418 (aset blurb (car tabs) ?:)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
419 (setq tabs (cdr tabs)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
420 (message blurb)))))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
421
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
422 (defun picture-tab-search (&optional arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
423 "Move to column beneath next interesting char in previous line.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
424 With ARG move to column occupied by next interesting character in this
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
425 line. The character must be preceded by whitespace.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
426 \"interesting characters\" are defined by variable `picture-tab-chars'.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
427 If no such character is found, move to beginning of line."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
428 (interactive "P")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
429 (let ((target (current-column)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
430 (save-excursion
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
431 (if (and (not arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
432 (progn
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
433 (beginning-of-line)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
434 (skip-chars-backward
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
435 (concat "^" (regexp-quote picture-tab-chars))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
436 (point-min))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
437 (not (bobp))))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
438 (move-to-column target))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
439 (if (re-search-forward
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
440 (concat "[ \t]+[" (regexp-quote picture-tab-chars) "]")
111429
249a1455856a Use line-end-position rather than end-of-line, etc.
Glenn Morris <rgm@gnu.org>
parents: 110494
diff changeset
441 (line-end-position)
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
442 'move)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
443 (setq target (1- (current-column)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
444 (setq target nil)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
445 (if target
18412
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
446 (move-to-column target t)
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
447 (beginning-of-line))))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
448
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
449 (defun picture-tab (&optional arg)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
450 "Tab transparently (just move point) to next tab stop.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
451 With prefix arg, overwrite the traversed text with spaces. The tab stop
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
452 list can be changed by \\[picture-set-tab-stops] and \\[edit-tab-stops].
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
453 See also documentation for variable `picture-tab-chars'."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
454 (interactive "P")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
455 (let* ((opoint (point)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
456 (move-to-tab-stop)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
457 (if arg
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
458 (let (indent-tabs-mode
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
459 (column (current-column)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
460 (delete-region opoint (point))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
461 (indent-to column)))))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
462
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
463 ;; Picture Rectangles
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
464
26078
1dfff19134ab (picture-killed-rectangle): Use defvar, not defconst.
Dave Love <fx@gnu.org>
parents: 25106
diff changeset
465 (defvar picture-killed-rectangle nil
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
466 "Rectangle killed or copied by \\[picture-clear-rectangle] in Picture mode.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
467 The contents can be retrieved by \\[picture-yank-rectangle]")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
468
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
469 (defun picture-clear-rectangle (start end &optional killp)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
470 "Clear and save rectangle delineated by point and mark.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
471 The rectangle is saved for yanking by \\[picture-yank-rectangle] and replaced
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
472 with whitespace. The previously saved rectangle, if any, is lost. With
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
473 prefix argument, the rectangle is actually killed, shifting remaining text."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
474 (interactive "r\nP")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
475 (setq picture-killed-rectangle (picture-snarf-rectangle start end killp)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
476
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
477 (defun picture-clear-rectangle-to-register (start end register &optional killp)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
478 "Clear rectangle delineated by point and mark into REGISTER.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
479 The rectangle is saved in REGISTER and replaced with whitespace. With
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
480 prefix argument, the rectangle is actually killed, shifting remaining text."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
481 (interactive "r\ncRectangle to register: \nP")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
482 (set-register register (picture-snarf-rectangle start end killp)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
483
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
484 (defun picture-snarf-rectangle (start end &optional killp)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
485 (let ((column (current-column))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
486 (indent-tabs-mode nil))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
487 (prog1 (save-excursion
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
488 (if killp
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
489 (delete-extract-rectangle start end)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
490 (prog1 (extract-rectangle start end)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
491 (clear-rectangle start end))))
18412
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
492 (move-to-column column t))))
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
493
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
494 (defun picture-yank-rectangle (&optional insertp)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
495 "Overlay rectangle saved by \\[picture-clear-rectangle]
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
496 The rectangle is positioned with upper left corner at point, overwriting
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
497 existing text. With prefix argument, the rectangle is inserted instead,
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
498 shifting existing text. Leaves mark at one corner of rectangle and
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
499 point at the other (diagonally opposed) corner."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
500 (interactive "P")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
501 (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
502 (error "No rectangle saved")
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
503 (picture-insert-rectangle picture-killed-rectangle insertp)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
504
8915
991438f3f39a (picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7300
diff changeset
505 (defun picture-yank-at-click (click arg)
991438f3f39a (picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7300
diff changeset
506 "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
507 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
508 Prefix arguments are interpreted as with \\[yank].
991438f3f39a (picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7300
diff changeset
509 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
510 regardless of where you click."
991438f3f39a (picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7300
diff changeset
511 (interactive "e\nP")
991438f3f39a (picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7300
diff changeset
512 (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
513 (picture-yank-rectangle arg))
991438f3f39a (picture-yank-at-click): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7300
diff changeset
514
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
515 (defun picture-yank-rectangle-from-register (register &optional insertp)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
516 "Overlay rectangle saved in REGISTER.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
517 The rectangle is positioned with upper left corner at point, overwriting
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
518 existing text. With prefix argument, the rectangle is
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
519 inserted instead, shifting existing text. Leaves mark at one corner
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
520 of rectangle and point at the other (diagonally opposed) corner."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
521 (interactive "cRectangle from register: \nP")
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
522 (let ((rectangle (get-register register)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
523 (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
524 (error "Register %c does not contain a rectangle" register)
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
525 (picture-insert-rectangle rectangle insertp))))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
526
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
527 (defun picture-insert-rectangle (rectangle &optional insertp)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
528 "Overlay RECTANGLE with upper left corner at point.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
529 Optional argument INSERTP, if non-nil causes RECTANGLE to be inserted.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
530 Leaves the region surrounding the rectangle."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
531 (let ((indent-tabs-mode nil))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
532 (if (not insertp)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
533 (save-excursion
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
534 (delete-rectangle (point)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
535 (progn
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
536 (picture-forward-column (length (car rectangle)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
537 (picture-move-down (1- (length rectangle)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
538 (point)))))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
539 (push-mark)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
540 (insert-rectangle rectangle)))
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
541
18412
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
542 (defun picture-current-line ()
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
543 "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
544 (+ (count-lines (point-min) (point))
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
545 (if (= (current-column) 0) 1 0)))
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
546
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
547 (defun picture-draw-rectangle (start end)
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
548 "Draw a rectangle around region."
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
549 (interactive "*r") ; start will be less than end
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
550 (let* ((sl (picture-current-line))
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
551 (sc (current-column))
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
552 (pvs picture-vertical-step)
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
553 (phs picture-horizontal-step)
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
554 (c1 (progn (goto-char start) (current-column)))
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
555 (r1 (picture-current-line))
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
556 (c2 (progn (goto-char end) (current-column)))
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
557 (r2 (picture-current-line))
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
558 (right (max c1 c2))
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
559 (left (min c1 c2))
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
560 (top (min r1 r2))
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
561 (bottom (max r1 r2)))
104543
da8b3e61b182 Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
562 (goto-char (point-min))
da8b3e61b182 Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
563 (forward-line (1- top))
43906
55003e5c6707 (picture-insert, picture-clear-column, picture-draw-rectangle):
Richard M. Stallman <rms@gnu.org>
parents: 43779
diff changeset
564 (move-to-column left t)
23756
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
565 (picture-update-desired-column t)
18412
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
566
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
567 (picture-movement-right)
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
568 (picture-insert picture-rectangle-ctl 1)
23756
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
569 (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
570
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
571 (picture-movement-down)
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
572 (picture-insert picture-rectangle-ctr 1)
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
573 (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
574
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
575 (picture-movement-left)
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
576 (picture-insert picture-rectangle-cbr 1)
23756
7a9b0b88448e Make a new map by make-keymap.
Kenichi Handa <handa@m17n.org>
parents: 20959
diff changeset
577 (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
578
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
579 (picture-movement-up)
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
580 (picture-insert picture-rectangle-cbl 1)
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
581 (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
582
3febbe908cc3 (picture-draw-rectangle): New command.
Richard M. Stallman <rms@gnu.org>
parents: 14567
diff changeset
583 (picture-set-motion pvs phs)
104543
da8b3e61b182 Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
584 (goto-char (point-min))
da8b3e61b182 Use forward-line rather than goto-line.
Glenn Morris <rgm@gnu.org>
parents: 100908
diff changeset
585 (forward-line (1- sl))
18412
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
588
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
589 ;; Picture Keymap, entry and exit points.
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
620 (define-key picture-mode-map "\C-c\C-d" 'delete-char)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
621 (define-key picture-mode-map "\e\t" 'picture-toggle-tab-state)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
622 (define-key picture-mode-map "\t" 'picture-tab)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
623 (define-key picture-mode-map "\e\t" 'picture-tab-search)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
624 (define-key picture-mode-map "\C-c\t" 'picture-set-tab-stops)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
625 (define-key picture-mode-map "\C-c\C-k" 'picture-clear-rectangle)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
626 (define-key picture-mode-map "\C-c\C-w" 'picture-clear-rectangle-to-register)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
627 (define-key picture-mode-map "\C-c\C-y" 'picture-yank-rectangle)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
630 (define-key picture-mode-map "\C-c\C-c" 'picture-mode-exit)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
631 (define-key picture-mode-map "\C-c\C-f" 'picture-motion)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
632 (define-key picture-mode-map "\C-c\C-b" 'picture-motion-reverse)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
633 (define-key picture-mode-map "\C-c<" 'picture-movement-left)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
634 (define-key picture-mode-map "\C-c>" 'picture-movement-right)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
635 (define-key picture-mode-map "\C-c^" 'picture-movement-up)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
636 (define-key picture-mode-map "\C-c." 'picture-movement-down)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
637 (define-key picture-mode-map "\C-c`" 'picture-movement-nw)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
638 (define-key picture-mode-map "\C-c'" 'picture-movement-ne)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
649
20959
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
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
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
652 Picture mode is invoked by the command \\[picture-mode]."
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
653 :type 'hook
9b831f34ff7d Customized.
Stephen Eglen <stephen@gnu.org>
parents: 18412
diff changeset
654 :group 'picture)
238
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
655
875
29b360fea58e entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
656 (defvar picture-mode-old-local-map)
29b360fea58e entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
657 (defvar picture-mode-old-mode-name)
29b360fea58e entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
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
29b360fea58e entered into RCS
Richard M. Stallman <rms@gnu.org>
parents: 846
diff changeset
660
256
7e4c7ef44243 *** empty log message ***
Roland McGrath <roland@gnu.org>
parents: 238
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
665 Printing characters replace instead of inserting themselves with motion
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
683 The current direction is displayed in the mode line. The initial
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
684 direction is right. Whitespace is inserted and tabs are changed to
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
685 spaces when required by movement. You can move around in the buffer
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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]
104922
c603ee2aac17 * keymap.c (QCadvertised_binding): New constant.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 104543
diff changeset
722 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
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
729
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
730 Note that Picture mode commands will work outside of Picture mode, but
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
731 they are not defaultly assigned to keys."
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
744 (make-local-variable 'picture-vertical-step)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
755
269
2ca8cdb96a9f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 256
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
758
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
768 (setq mode-name picture-mode-old-mode-name)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
769 (use-local-map picture-mode-old-local-map)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
770 (setq major-mode picture-mode-old-major-mode)
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
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
d2e1685ba8f1 Initial revision
Brian Preble <rassilon@gnu.org>
parents:
diff changeset
775
584
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 269
diff changeset
776 (provide 'picture)
4cd7543be581 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 269
diff changeset
777
659
505130d1ddf8 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 584
diff changeset
778 ;;; picture.el ends here