Mercurial > emacs
annotate lisp/emulation/cua-rect.el @ 108576:c85c4eac55a6
* progmodes/sh-script.el (sh-mode-default-syntax-table): Remove.
(sh-mode-syntax-table): Give it a default value instead.
(sh-header-marker): Make buffer-local.
(sh-mode): Move make-local-variable to the corresponding setq.
(sh-add-completer): Avoid gratuitously let-binding a buffer-local var.
Use complete-with-action.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 14 May 2010 17:21:12 -0400 |
parents | 114b70461f96 |
children | d835100c3e8b |
rev | line source |
---|---|
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1 ;;; cua-rect.el --- CUA unified rectangle support |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2 |
64701
34bd8e434dd7
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64085
diff
changeset
|
3 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, |
106815 | 4 ;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6 ;; Author: Kim F. Storm <storm@cua.dk> |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7 ;; Keywords: keyboard emulations convenience CUA |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9 ;; This file is part of GNU Emacs. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
10 |
94658
eb7b2376cae5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
12 ;; it under the terms of the GNU General Public License as published by |
94658
eb7b2376cae5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
eb7b2376cae5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
14 ;; (at your option) any later version. |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
15 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
16 ;; GNU Emacs is distributed in the hope that it will be useful, |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
19 ;; GNU General Public License for more details. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
20 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
21 ;; You should have received a copy of the GNU General Public License |
94658
eb7b2376cae5
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
93975
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
23 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
24 ;;; Acknowledgements |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
25 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
26 ;; The rectangle handling and display code borrows from the standard |
45318 | 27 ;; GNU emacs rect.el package and the rect-mark.el package by Rick |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
28 ;; Sladkey <jrs@world.std.com>. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
29 |
45078 | 30 ;;; Commentary: |
31 | |
32 ;;; Code: | |
33 | |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
34 (eval-when-compile |
87020
52abd10af81e
(top-level): Move provide to end.
Glenn Morris <rgm@gnu.org>
parents:
84905
diff
changeset
|
35 (require 'cua-base)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
36 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
37 ;;; Rectangle support |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
38 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
39 (require 'rect) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
40 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
41 ;; If non-nil, restrict current region to this rectangle. |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
42 ;; Value is a vector [top bot left right corner ins virt select]. |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
43 ;; CORNER specifies currently active corner 0=t/l 1=t/r 2=b/l 3=b/r. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
44 ;; INS specifies whether to insert on left(nil) or right(t) side. |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
45 ;; If VIRT is non-nil, virtual straight edges are enabled. |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
46 ;; If SELECT is a regexp, only lines starting with that regexp are affected.") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
47 (defvar cua--rectangle nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
48 (make-variable-buffer-local 'cua--rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
49 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
50 ;; Most recent rectangle geometry. Note: car is buffer. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
51 (defvar cua--last-rectangle nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
52 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
53 ;; Rectangle restored by undo. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
54 (defvar cua--restored-rectangle nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
55 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
56 ;; Last rectangle copied/killed; nil if last kill was not a rectangle. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
57 (defvar cua--last-killed-rectangle nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
58 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
59 ;; List of overlays used to display current rectangle. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
60 (defvar cua--rectangle-overlays nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
61 (make-variable-buffer-local 'cua--rectangle-overlays) |
67214
4fd503f32b2c
(cua--rectangle-overlays): Make permanent-local.
Kim F. Storm <storm@cua.dk>
parents:
67143
diff
changeset
|
62 (put 'cua--rectangle-overlays 'permanent-local t) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
63 |
56902
8d62e1b62c44
* emulation/cua-rect.el (cua--overlay-keymap): New keymap for
Kim F. Storm <storm@cua.dk>
parents:
56896
diff
changeset
|
64 (defvar cua--overlay-keymap |
8d62e1b62c44
* emulation/cua-rect.el (cua--overlay-keymap): New keymap for
Kim F. Storm <storm@cua.dk>
parents:
56896
diff
changeset
|
65 (let ((map (make-sparse-keymap))) |
8d62e1b62c44
* emulation/cua-rect.el (cua--overlay-keymap): New keymap for
Kim F. Storm <storm@cua.dk>
parents:
56896
diff
changeset
|
66 (define-key map "\r" 'cua-rotate-rectangle))) |
8d62e1b62c44
* emulation/cua-rect.el (cua--overlay-keymap): New keymap for
Kim F. Storm <storm@cua.dk>
parents:
56896
diff
changeset
|
67 |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
68 (defvar cua--virtual-edges-debug nil) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
69 |
59973
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
70 ;; Undo rectangle commands. |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
71 |
59973
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
72 (defvar cua--rect-undo-set-point nil) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
73 |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
74 (defun cua--rectangle-undo-boundary () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
75 (when (listp buffer-undo-list) |
59973
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
76 (let ((s (cua--rect-start-position)) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
77 (e (cua--rect-end-position))) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
78 (undo-boundary) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
79 (push (list 'apply 0 s e |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
80 'cua--rect-undo-handler |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
81 (copy-sequence cua--rectangle) t s e) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
82 buffer-undo-list)))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
83 |
59973
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
84 (defun cua--rect-undo-handler (rect on s e) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
85 (if (setq on (not on)) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
86 (setq cua--rect-undo-set-point s) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
87 (setq cua--restored-rectangle (copy-sequence rect)) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
88 (setq cua--buffer-and-point-before-command nil)) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
89 (push (list 'apply 0 s (if on e s) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
90 'cua--rect-undo-handler rect on s e) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
91 buffer-undo-list)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
92 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
93 ;;; Rectangle geometry |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
94 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
95 (defun cua--rectangle-top (&optional val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
96 ;; Top of CUA rectangle (buffer position on first line). |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
97 (if (not val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
98 (aref cua--rectangle 0) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
99 (setq val (line-beginning-position)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
100 (if (<= val (aref cua--rectangle 1)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
101 (aset cua--rectangle 0 val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
102 (aset cua--rectangle 1 val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
103 (cua--rectangle-corner 2)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
104 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
105 (defun cua--rectangle-bot (&optional val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
106 ;; Bot of CUA rectangle (buffer position on last line). |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
107 (if (not val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
108 (aref cua--rectangle 1) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
109 (setq val (line-end-position)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
110 (if (>= val (aref cua--rectangle 0)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
111 (aset cua--rectangle 1 val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
112 (aset cua--rectangle 0 val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
113 (cua--rectangle-corner 2)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
114 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
115 (defun cua--rectangle-left (&optional val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
116 ;; Left column of CUA rectangle. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
117 (if (integerp val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
118 (if (<= val (aref cua--rectangle 3)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
119 (aset cua--rectangle 2 val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
120 (aset cua--rectangle 3 val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
121 (cua--rectangle-corner (if (cua--rectangle-right-side) -1 1))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
122 (aref cua--rectangle 2))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
123 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
124 (defun cua--rectangle-right (&optional val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
125 ;; Right column of CUA rectangle. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
126 (if (integerp val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
127 (if (>= val (aref cua--rectangle 2)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
128 (aset cua--rectangle 3 val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
129 (aset cua--rectangle 2 val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
130 (cua--rectangle-corner (if (cua--rectangle-right-side) -1 1))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
131 (aref cua--rectangle 3))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
132 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
133 (defun cua--rectangle-corner (&optional advance) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
134 ;; Currently active corner of rectangle. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
135 (let ((c (aref cua--rectangle 4))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
136 (if (not (integerp advance)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
137 c |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46180
diff
changeset
|
138 (aset cua--rectangle 4 |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
139 (if (= advance 0) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
140 (- 3 c) ; opposite corner |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
141 (mod (+ c 4 advance) 4))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
142 (aset cua--rectangle 5 0)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
143 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
144 (defun cua--rectangle-right-side (&optional topbot) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
145 ;; t if point is on right side of rectangle. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
146 (if (and topbot (= (cua--rectangle-left) (cua--rectangle-right))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
147 (< (cua--rectangle-corner) 2) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
148 (= (mod (cua--rectangle-corner) 2) 1))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
149 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
150 (defun cua--rectangle-column () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
151 (if (cua--rectangle-right-side) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
152 (cua--rectangle-right) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
153 (cua--rectangle-left))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
154 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
155 (defun cua--rectangle-insert-col (&optional col) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
156 ;; Currently active corner of rectangle. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
157 (if (integerp col) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
158 (aset cua--rectangle 5 col) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
159 (if (cua--rectangle-right-side t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
160 (if (= (aref cua--rectangle 5) 0) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
161 (1+ (cua--rectangle-right)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
162 (aref cua--rectangle 5)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
163 (cua--rectangle-left)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
164 |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
165 (defun cua--rectangle-virtual-edges (&optional set val) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
166 ;; Current setting of rectangle virtual-edges |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
167 (if set |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
168 (aset cua--rectangle 6 val)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
169 (and ;(not buffer-read-only) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
170 (aref cua--rectangle 6))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
171 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
172 (defun cua--rectangle-restriction (&optional val bounded negated) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
173 ;; Current rectangle restriction |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
174 (if val |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
175 (aset cua--rectangle 7 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
176 (and (stringp val) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
177 (> (length val) 0) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
178 (list val bounded negated))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
179 (aref cua--rectangle 7))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
180 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
181 (defun cua--rectangle-assert () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
182 (message "%S (%d)" cua--rectangle (point)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
183 (if (< (cua--rectangle-right) (cua--rectangle-left)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
184 (message "rectangle right < left")) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
185 (if (< (cua--rectangle-bot) (cua--rectangle-top)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
186 (message "rectangle bot < top"))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
187 |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
188 (defun cua--rectangle-get-corners () |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
189 ;; Calculate the rectangular region represented by point and mark, |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
190 ;; putting start in the upper left corner and end in the |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
191 ;; bottom right corner. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
192 (let ((top (point)) (bot (mark)) r l corner) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
193 (save-excursion |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
194 (goto-char top) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
195 (setq l (current-column)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
196 (goto-char bot) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
197 (setq r (current-column)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
198 (if (<= top bot) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
199 (setq corner (if (<= l r) 0 1)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
200 (setq top (prog1 bot (setq bot top))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
201 (setq corner (if (<= l r) 2 3))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
202 (if (<= l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
203 (if (< l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
204 (setq r (1- r))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
205 (setq l (prog1 r (setq r l))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
206 (goto-char top) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
207 (move-to-column l) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
208 (setq top (point)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
209 (goto-char bot) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
210 (move-to-column r) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
211 (setq bot (point)))) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
212 (vector top bot l r corner 0 cua-virtual-rectangle-edges nil))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
213 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
214 (defun cua--rectangle-set-corners () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
215 ;; Set mark and point in opposite corners of current rectangle. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
216 (let (pp pc mp mc (c (cua--rectangle-corner))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
217 (cond |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
218 ((= c 0) ; top/left -> bot/right |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
219 (setq pp (cua--rectangle-top) pc (cua--rectangle-left) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
220 mp (cua--rectangle-bot) mc (cua--rectangle-right))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
221 ((= c 1) ; top/right -> bot/left |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
222 (setq pp (cua--rectangle-top) pc (cua--rectangle-right) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
223 mp (cua--rectangle-bot) mc (cua--rectangle-left))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
224 ((= c 2) ; bot/left -> top/right |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
225 (setq pp (cua--rectangle-bot) pc (cua--rectangle-left) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
226 mp (cua--rectangle-top) mc (cua--rectangle-right))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
227 ((= c 3) ; bot/right -> top/left |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
228 (setq pp (cua--rectangle-bot) pc (cua--rectangle-right) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
229 mp (cua--rectangle-top) mc (cua--rectangle-left)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
230 (goto-char mp) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
231 (move-to-column mc) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
232 (set-mark (point)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
233 (goto-char pp) |
56902
8d62e1b62c44
* emulation/cua-rect.el (cua--overlay-keymap): New keymap for
Kim F. Storm <storm@cua.dk>
parents:
56896
diff
changeset
|
234 ;; Move cursor inside rectangle, except if char at rigth edge is a tab. |
56896
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
235 (if (and (if (cua--rectangle-right-side) |
56902
8d62e1b62c44
* emulation/cua-rect.el (cua--overlay-keymap): New keymap for
Kim F. Storm <storm@cua.dk>
parents:
56896
diff
changeset
|
236 (and (= (move-to-column pc) (- pc tab-width)) |
8d62e1b62c44
* emulation/cua-rect.el (cua--overlay-keymap): New keymap for
Kim F. Storm <storm@cua.dk>
parents:
56896
diff
changeset
|
237 (not (eolp))) |
56896
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
238 (> (move-to-column pc) pc)) |
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
239 (not (bolp))) |
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
240 (backward-char 1)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
241 )) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
242 |
59973
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
243 (defun cua--rect-start-position () |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
244 ;; Return point of top left corner |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
245 (save-excursion |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
246 (goto-char (cua--rectangle-top)) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
247 (and (> (move-to-column (cua--rectangle-left)) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
248 (cua--rectangle-left)) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
249 (not (bolp)) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
250 (backward-char 1)) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
251 (point))) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
252 |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
253 (defun cua--rect-end-position () |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
254 ;; Return point of bottom right cornet |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
255 (save-excursion |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
256 (goto-char (cua--rectangle-bot)) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
257 (and (= (move-to-column (cua--rectangle-right)) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
258 (- (cua--rectangle-right) tab-width)) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
259 (not (eolp)) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
260 (not (bolp)) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
261 (backward-char 1)) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
262 (point))) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
263 |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
264 ;;; Rectangle resizing |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
265 |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
266 (defun cua--forward-line (n) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
267 ;; Move forward/backward one line. Returns t if movement. |
56902
8d62e1b62c44
* emulation/cua-rect.el (cua--overlay-keymap): New keymap for
Kim F. Storm <storm@cua.dk>
parents:
56896
diff
changeset
|
268 (let ((pt (point))) |
8d62e1b62c44
* emulation/cua-rect.el (cua--overlay-keymap): New keymap for
Kim F. Storm <storm@cua.dk>
parents:
56896
diff
changeset
|
269 (and (= (forward-line n) 0) |
8d62e1b62c44
* emulation/cua-rect.el (cua--overlay-keymap): New keymap for
Kim F. Storm <storm@cua.dk>
parents:
56896
diff
changeset
|
270 ;; Deal with end of buffer |
8d62e1b62c44
* emulation/cua-rect.el (cua--overlay-keymap): New keymap for
Kim F. Storm <storm@cua.dk>
parents:
56896
diff
changeset
|
271 (or (not (eobp)) |
8d62e1b62c44
* emulation/cua-rect.el (cua--overlay-keymap): New keymap for
Kim F. Storm <storm@cua.dk>
parents:
56896
diff
changeset
|
272 (goto-char pt))))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
273 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
274 (defun cua--rectangle-resized () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
275 ;; Refresh state after resizing rectangle |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
276 (setq cua--buffer-and-point-before-command nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
277 (cua--rectangle-insert-col 0) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
278 (cua--rectangle-set-corners) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
279 (cua--keep-active)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
280 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
281 (defun cua-resize-rectangle-right (n) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
282 "Resize rectangle to the right." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
283 (interactive "p") |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
284 (let ((resized (> n 0))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
285 (while (> n 0) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
286 (setq n (1- n)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
287 (cond |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
288 ((cua--rectangle-right-side) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
289 (cua--rectangle-right (1+ (cua--rectangle-right))) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
290 (move-to-column (cua--rectangle-right))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
291 (t |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
292 (cua--rectangle-left (1+ (cua--rectangle-left))) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
293 (move-to-column (cua--rectangle-right))))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
294 (if resized |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
295 (cua--rectangle-resized)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
296 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
297 (defun cua-resize-rectangle-left (n) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
298 "Resize rectangle to the left." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
299 (interactive "p") |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
300 (let (resized) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
301 (while (> n 0) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
302 (setq n (1- n)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
303 (if (or (= (cua--rectangle-right) 0) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
304 (and (not (cua--rectangle-right-side)) (= (cua--rectangle-left) 0))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
305 (setq n 0) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
306 (cond |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
307 ((cua--rectangle-right-side) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
308 (cua--rectangle-right (1- (cua--rectangle-right))) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
309 (move-to-column (cua--rectangle-right))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
310 (t |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
311 (cua--rectangle-left (1- (cua--rectangle-left))) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
312 (move-to-column (cua--rectangle-right)))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
313 (setq resized t))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
314 (if resized |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
315 (cua--rectangle-resized)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
316 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
317 (defun cua-resize-rectangle-down (n) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
318 "Resize rectangle downwards." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
319 (interactive "p") |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
320 (let (resized) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
321 (while (> n 0) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
322 (setq n (1- n)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
323 (cond |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
324 ((>= (cua--rectangle-corner) 2) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
325 (goto-char (cua--rectangle-bot)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
326 (when (cua--forward-line 1) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
327 (move-to-column (cua--rectangle-column)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
328 (cua--rectangle-bot t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
329 (setq resized t))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
330 (t |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
331 (goto-char (cua--rectangle-top)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
332 (when (cua--forward-line 1) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
333 (move-to-column (cua--rectangle-column)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
334 (cua--rectangle-top t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
335 (setq resized t))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
336 (if resized |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
337 (cua--rectangle-resized)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
338 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
339 (defun cua-resize-rectangle-up (n) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
340 "Resize rectangle upwards." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
341 (interactive "p") |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
342 (let (resized) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
343 (while (> n 0) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
344 (setq n (1- n)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
345 (cond |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
346 ((>= (cua--rectangle-corner) 2) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
347 (goto-char (cua--rectangle-bot)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
348 (when (cua--forward-line -1) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
349 (move-to-column (cua--rectangle-column)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
350 (cua--rectangle-bot t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
351 (setq resized t))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
352 (t |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
353 (goto-char (cua--rectangle-top)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
354 (when (cua--forward-line -1) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
355 (move-to-column (cua--rectangle-column)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
356 (cua--rectangle-top t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
357 (setq resized t))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
358 (if resized |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
359 (cua--rectangle-resized)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
360 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
361 (defun cua-resize-rectangle-eol () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
362 "Resize rectangle to end of line." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
363 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
364 (unless (eolp) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
365 (end-of-line) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
366 (if (> (current-column) (cua--rectangle-right)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
367 (cua--rectangle-right (current-column))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
368 (if (not (cua--rectangle-right-side)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
369 (cua--rectangle-corner 1)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
370 (cua--rectangle-resized))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
371 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
372 (defun cua-resize-rectangle-bol () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
373 "Resize rectangle to beginning of line." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
374 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
375 (unless (bolp) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
376 (beginning-of-line) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
377 (cua--rectangle-left (current-column)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
378 (if (cua--rectangle-right-side) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
379 (cua--rectangle-corner -1)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
380 (cua--rectangle-resized))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
381 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
382 (defun cua-resize-rectangle-bot () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
383 "Resize rectangle to bottom of buffer." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
384 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
385 (goto-char (point-max)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
386 (move-to-column (cua--rectangle-column)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
387 (cua--rectangle-bot t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
388 (cua--rectangle-resized)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
389 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
390 (defun cua-resize-rectangle-top () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
391 "Resize rectangle to top of buffer." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
392 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
393 (goto-char (point-min)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
394 (move-to-column (cua--rectangle-column)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
395 (cua--rectangle-top t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
396 (cua--rectangle-resized)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
397 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
398 (defun cua-resize-rectangle-page-up () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
399 "Resize rectangle upwards by one scroll page." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
400 (interactive) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
401 (scroll-down) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
402 (move-to-column (cua--rectangle-column)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
403 (if (>= (cua--rectangle-corner) 2) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
404 (cua--rectangle-bot t) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
405 (cua--rectangle-top t)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
406 (cua--rectangle-resized)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
407 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
408 (defun cua-resize-rectangle-page-down () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
409 "Resize rectangle downwards by one scroll page." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
410 (interactive) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
411 (scroll-up) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
412 (move-to-column (cua--rectangle-column)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
413 (if (>= (cua--rectangle-corner) 2) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
414 (cua--rectangle-bot t) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
415 (cua--rectangle-top t)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
416 (cua--rectangle-resized)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
417 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
418 ;;; Mouse support |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
419 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
420 ;; This is pretty simplistic, but it does the job... |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
421 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
422 (defun cua-mouse-resize-rectangle (event) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
423 "Set rectangle corner at mouse click position." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
424 (interactive "e") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
425 (mouse-set-point event) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
426 ;; FIX ME -- need to calculate virtual column. |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
427 (if (cua--rectangle-virtual-edges) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
428 (move-to-column (car (posn-col-row (event-end event))) t)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
429 (if (cua--rectangle-right-side) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
430 (cua--rectangle-right (current-column)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
431 (cua--rectangle-left (current-column))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
432 (if (>= (cua--rectangle-corner) 2) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
433 (cua--rectangle-bot t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
434 (cua--rectangle-top t)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
435 (cua--rectangle-resized)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
436 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
437 (defvar cua--mouse-last-pos nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
438 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
439 (defun cua-mouse-set-rectangle-mark (event) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
440 "Start rectangle at mouse click position." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
441 (interactive "e") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
442 (when cua--rectangle |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
443 (cua--deactivate-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
444 (cua--deactivate t)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
445 (setq cua--last-rectangle nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
446 (mouse-set-point event) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
447 ;; FIX ME -- need to calculate virtual column. |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
448 (cua-set-rectangle-mark) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
449 (setq cua--buffer-and-point-before-command nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
450 (setq cua--mouse-last-pos nil)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
451 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
452 (defun cua-mouse-save-then-kill-rectangle (event arg) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
453 "Expand rectangle to mouse click position and copy rectangle. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
454 If command is repeated at same position, delete the rectangle." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
455 (interactive "e\nP") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
456 (if (and (eq this-command last-command) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
457 (eq (point) (car-safe cua--mouse-last-pos)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
458 (eq cua--last-killed-rectangle (cdr-safe cua--mouse-last-pos))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
459 (progn |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
460 (unless buffer-read-only |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
461 (cua--delete-rectangle)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
462 (cua--deactivate)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
463 (cua-mouse-resize-rectangle event) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
464 (let ((cua-keep-region-after-copy t)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
465 (cua-copy-rectangle arg) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
466 (setq cua--mouse-last-pos (cons (point) cua--last-killed-rectangle))))) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
467 |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
468 (defun cua--mouse-ignore (event) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
469 (interactive "e") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
470 (setq this-command last-command)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
471 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
472 (defun cua--rectangle-move (dir) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
473 (let ((moved t) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
474 (top (cua--rectangle-top)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
475 (bot (cua--rectangle-bot)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
476 (l (cua--rectangle-left)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
477 (r (cua--rectangle-right))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
478 (cond |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
479 ((eq dir 'up) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
480 (goto-char top) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
481 (when (cua--forward-line -1) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
482 (cua--rectangle-top t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
483 (goto-char bot) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
484 (forward-line -1) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
485 (cua--rectangle-bot t))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
486 ((eq dir 'down) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
487 (goto-char bot) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
488 (when (cua--forward-line 1) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
489 (cua--rectangle-bot t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
490 (goto-char top) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
491 (cua--forward-line 1) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
492 (cua--rectangle-top t))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
493 ((eq dir 'left) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
494 (when (> l 0) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
495 (cua--rectangle-left (1- l)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
496 (cua--rectangle-right (1- r)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
497 ((eq dir 'right) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
498 (cua--rectangle-right (1+ r)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
499 (cua--rectangle-left (1+ l))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
500 (t |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
501 (setq moved nil))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
502 (when moved |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
503 (setq cua--buffer-and-point-before-command nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
504 (cua--rectangle-set-corners) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
505 (cua--keep-active)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
506 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
507 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
508 ;;; Operations on current rectangle |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
509 |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
510 (defun cua--tabify-start (start end) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
511 ;; Return position where auto-tabify should start (or nil if not required). |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
512 (save-excursion |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
513 (save-restriction |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
514 (widen) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
515 (and (not buffer-read-only) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
516 cua-auto-tabify-rectangles |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
517 (if (or (not (integerp cua-auto-tabify-rectangles)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
518 (= (point-min) (point-max)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
519 (progn |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
520 (goto-char (max (point-min) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
521 (- start cua-auto-tabify-rectangles))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
522 (search-forward "\t" (min (point-max) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
523 (+ end cua-auto-tabify-rectangles)) t))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
524 start))))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
525 |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
526 (defun cua--rectangle-operation (keep-clear visible undo pad tabify &optional fct post-fct) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
527 ;; Call FCT for each line of region with 4 parameters: |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
528 ;; Region start, end, left-col, right-col |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
529 ;; Point is at start when FCT is called |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
530 ;; Call fct with (s,e) = whole lines if VISIBLE non-nil. |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
531 ;; Only call fct for visible lines if VISIBLE==t. |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
532 ;; Set undo boundary if UNDO is non-nil. |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
533 ;; Rectangle is padded if PAD = t or numeric and (cua--rectangle-virtual-edges) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
534 ;; Perform auto-tabify after operation if TABIFY is non-nil. |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
535 ;; Mark is kept if keep-clear is 'keep and cleared if keep-clear is 'clear. |
57075
57f225a13a09
(cua--rectangle-operation): Let bind
Kim F. Storm <storm@cua.dk>
parents:
57011
diff
changeset
|
536 (let* ((inhibit-field-text-motion t) |
57f225a13a09
(cua--rectangle-operation): Let bind
Kim F. Storm <storm@cua.dk>
parents:
57011
diff
changeset
|
537 (start (cua--rectangle-top)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
538 (end (cua--rectangle-bot)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
539 (l (cua--rectangle-left)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
540 (r (1+ (cua--rectangle-right))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
541 (m (make-marker)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
542 (tabpad (and (integerp pad) (= pad 2))) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
543 (sel (cua--rectangle-restriction)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
544 (tabify-start (and tabify (cua--tabify-start start end)))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
545 (if undo |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
546 (cua--rectangle-undo-boundary)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
547 (if (integerp pad) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
548 (setq pad (cua--rectangle-virtual-edges))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
549 (save-excursion |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
550 (save-restriction |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
551 (widen) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
552 (when (> (cua--rectangle-corner) 1) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
553 (goto-char end) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
554 (and (bolp) (not (eolp)) (not (eobp)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
555 (setq end (1+ end)))) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
556 (when (eq visible t) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
557 (setq start (max (window-start) start)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
558 (setq end (min (window-end) end))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
559 (goto-char end) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
560 (setq end (line-end-position)) |
56896
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
561 (if (and visible (bolp) (not (eobp))) |
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
562 (setq end (1+ end))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
563 (goto-char start) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
564 (setq start (line-beginning-position)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
565 (narrow-to-region start end) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
566 (goto-char (point-min)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
567 (while (< (point) (point-max)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
568 (move-to-column r pad) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
569 (and (not pad) (not visible) (> (current-column) r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
570 (backward-char 1)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
571 (if (and tabpad (not pad) (looking-at "\t")) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
572 (forward-char 1)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
573 (set-marker m (point)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
574 (move-to-column l pad) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
575 (if (and fct (or visible (and (>= (current-column) l) (<= (current-column) r)))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
576 (let ((v t) (p (point))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
577 (when sel |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
578 (if (car (cdr sel)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
579 (setq v (looking-at (car sel))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
580 (setq v (re-search-forward (car sel) m t)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
581 (goto-char p)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
582 (if (car (cdr (cdr sel))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
583 (setq v (null v)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
584 (if visible |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
585 (funcall fct p m l r v) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
586 (if v |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
587 (funcall fct p m l r))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
588 (set-marker m nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
589 (forward-line 1)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
590 (if (not visible) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
591 (cua--rectangle-bot t)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
592 (if post-fct |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
593 (funcall post-fct l r)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
594 (when tabify-start |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
595 (tabify tabify-start (point))))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
596 (cond |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
597 ((eq keep-clear 'keep) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
598 (cua--keep-active)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
599 ((eq keep-clear 'clear) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
600 (cua--deactivate)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
601 ((eq keep-clear 'corners) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
602 (cua--rectangle-set-corners) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
603 (cua--keep-active))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
604 (setq cua--buffer-and-point-before-command nil))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
605 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
606 (put 'cua--rectangle-operation 'lisp-indent-function 4) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
607 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
608 (defun cua--delete-rectangle () |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
609 (let ((lines 0)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
610 (if (not (cua--rectangle-virtual-edges)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
611 (cua--rectangle-operation nil nil t 2 t |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
612 '(lambda (s e l r v) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
613 (setq lines (1+ lines)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
614 (if (and (> e s) (<= e (point-max))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
615 (delete-region s e)))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
616 (cua--rectangle-operation nil 1 t nil t |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
617 '(lambda (s e l r v) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
618 (setq lines (1+ lines)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
619 (when (and (> e s) (<= e (point-max))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
620 (delete-region s e))))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
621 lines)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
622 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
623 (defun cua--extract-rectangle () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
624 (let (rect) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
625 (if (not (cua--rectangle-virtual-edges)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
626 (cua--rectangle-operation nil nil nil nil nil ; do not tabify |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
627 '(lambda (s e l r) |
108467
114b70461f96
CUA mode: Fix use of `filter-buffer-substring' (rework previous change).
Juanma Barranquero <lekktu@gmail.com>
parents:
107853
diff
changeset
|
628 (setq rect (cons (cua--filter-buffer-noprops s e) rect)))) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
629 (cua--rectangle-operation nil 1 nil nil nil ; do not tabify |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
630 '(lambda (s e l r v) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
631 (let ((copy t) (bs 0) (as 0) row) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
632 (if (= s e) (setq e (1+ e))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
633 (goto-char s) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
634 (move-to-column l) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
635 (if (= (point) (line-end-position)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
636 (setq bs (- r l) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
637 copy nil) |
67419
79aa532aaa44
(cua--extract-rectangle): Undo recent change re. \s in strings.
Kim F. Storm <storm@cua.dk>
parents:
67407
diff
changeset
|
638 (skip-chars-forward "\s\t" e) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
639 (setq bs (- (min r (current-column)) l) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
640 s (point)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
641 (move-to-column r) |
67419
79aa532aaa44
(cua--extract-rectangle): Undo recent change re. \s in strings.
Kim F. Storm <storm@cua.dk>
parents:
67407
diff
changeset
|
642 (skip-chars-backward "\s\t" s) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
643 (setq as (- r (max (current-column) l)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
644 e (point))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
645 (setq row (if (and copy (> e s)) |
108467
114b70461f96
CUA mode: Fix use of `filter-buffer-substring' (rework previous change).
Juanma Barranquero <lekktu@gmail.com>
parents:
107853
diff
changeset
|
646 (cua--filter-buffer-noprops s e) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
647 "")) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
648 (when (> bs 0) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
649 (setq row (concat (make-string bs ?\s) row))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
650 (when (> as 0) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
651 (setq row (concat row (make-string as ?\s)))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
652 (setq rect (cons row rect)))))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
653 (nreverse rect))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
654 |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
655 (defun cua--insert-rectangle (rect &optional below paste-column line-count) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
656 ;; Insert rectangle as insert-rectangle, but don't set mark and exit with |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
657 ;; point at either next to top right or below bottom left corner |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
658 ;; Notice: In overwrite mode, the rectangle is inserted as separate text lines. |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
659 (if (eq below 'auto) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
660 (setq below (and (bolp) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
661 (or (eolp) (eobp) (= (1+ (point)) (point-max)))))) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
662 (unless paste-column |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
663 (setq paste-column (current-column))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
664 (let ((lines rect) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
665 (first t) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
666 (tabify-start (cua--tabify-start (point) (point))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
667 last-column |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
668 p) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
669 (while (or lines below) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
670 (or first |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
671 (if overwrite-mode |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
672 (insert ?\n) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
673 (forward-line 1) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
674 (or (bolp) (insert ?\n)))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
675 (unless overwrite-mode |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
676 (move-to-column paste-column t)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
677 (if (not lines) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
678 (setq below nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
679 (insert-for-yank (car lines)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
680 (unless last-column |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
681 (setq last-column (current-column))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
682 (setq lines (cdr lines)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
683 (and first (not below) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
684 (setq p (point)))) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
685 (setq first nil) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
686 (if (and line-count (= (setq line-count (1- line-count)) 0)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
687 (setq lines nil))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
688 (when (and line-count last-column (not overwrite-mode)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
689 (while (> line-count 0) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
690 (forward-line 1) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
691 (or (bolp) (insert ?\n)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
692 (move-to-column paste-column t) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
693 (insert-char ?\s (- last-column paste-column -1)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
694 (setq line-count (1- line-count)))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
695 (when (and tabify-start |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
696 (not overwrite-mode)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
697 (tabify tabify-start (point))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
698 (and p (not overwrite-mode) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
699 (goto-char p)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
700 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
701 (defun cua--copy-rectangle-as-kill (&optional ring) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
702 (if cua--register |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
703 (set-register cua--register (cua--extract-rectangle)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
704 (setq killed-rectangle (cua--extract-rectangle)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
705 (setq cua--last-killed-rectangle (cons (and kill-ring (car kill-ring)) killed-rectangle)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
706 (if ring |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
707 (kill-new (mapconcat |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
708 (function (lambda (row) (concat row "\n"))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
709 killed-rectangle ""))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
710 |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
711 (defun cua--activate-rectangle () |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
712 ;; Turn on rectangular marking mode by disabling transient mark mode |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
713 ;; and manually handling highlighting from a post command hook. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
714 ;; Be careful if we are already marking a rectangle. |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46180
diff
changeset
|
715 (setq cua--rectangle |
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46180
diff
changeset
|
716 (if (and cua--last-rectangle |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
717 (eq (car cua--last-rectangle) (current-buffer)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
718 (eq (car (cdr cua--last-rectangle)) (point))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
719 (cdr (cdr cua--last-rectangle)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
720 (cua--rectangle-get-corners)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
721 cua--status-string (if (cua--rectangle-virtual-edges) " [R]" "") |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
722 cua--last-rectangle nil)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
723 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
724 ;; (defvar cua-save-point nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
725 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
726 (defun cua--deactivate-rectangle () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
727 ;; This is used to clean up after `cua--activate-rectangle'. |
84905
47928cf63c6c
(cua--deactivate-rectangle, cua--highlight-rectangle,
Juanma Barranquero <lekktu@gmail.com>
parents:
78218
diff
changeset
|
728 (mapc (function delete-overlay) cua--rectangle-overlays) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46180
diff
changeset
|
729 (setq cua--last-rectangle (cons (current-buffer) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
730 (cons (point) ;; cua-save-point |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
731 cua--rectangle)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
732 cua--rectangle nil |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
733 cua--rectangle-overlays nil |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
734 cua--status-string nil |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
735 cua--mouse-last-pos nil)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
736 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
737 (defun cua--highlight-rectangle () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
738 ;; This function is used to highlight the rectangular region. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
739 ;; We do this by putting an overlay on each line within the rectangle. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
740 ;; Each overlay extends across all the columns of the rectangle. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
741 ;; We try to reuse overlays where possible because this is more efficient |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
742 ;; and results in less flicker. |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
743 ;; If cua--rectangle-virtual-edges is nil and the buffer contains tabs or short lines, |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
744 ;; the higlighted region may not be perfectly rectangular. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
745 (let ((deactivate-mark deactivate-mark) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
746 (old cua--rectangle-overlays) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
747 (new nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
748 (left (cua--rectangle-left)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
749 (right (1+ (cua--rectangle-right)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
750 (when (/= left right) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
751 (sit-for 0) ; make window top/bottom reliable |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
752 (cua--rectangle-operation nil t nil nil nil ; do not tabify |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
753 '(lambda (s e l r v) |
63073
f1bf3660220e
* emulation/cua-base.el (cua-rectangle, cua-rectangle-noselect)
Kim F. Storm <storm@cua.dk>
parents:
62450
diff
changeset
|
754 (let ((rface (if v 'cua-rectangle 'cua-rectangle-noselect)) |
56896
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
755 overlay bs ms as) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
756 (when (cua--rectangle-virtual-edges) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
757 (let ((lb (line-beginning-position)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
758 (le (line-end-position)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
759 cl cl0 pl cr cr0 pr) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
760 (goto-char s) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
761 (setq cl (move-to-column l) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
762 pl (point)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
763 (setq cr (move-to-column r) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
764 pr (point)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
765 (if (= lb pl) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
766 (setq cl0 0) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
767 (goto-char (1- pl)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
768 (setq cl0 (current-column))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
769 (if (= lb le) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
770 (setq cr0 0) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
771 (goto-char (1- pr)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
772 (setq cr0 (current-column))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
773 (unless (and (= cl l) (= cr r)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
774 (when (/= cl l) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
775 (setq bs (propertize |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
776 (make-string |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
777 (- l cl0 (if (and (= le pl) (/= le lb)) 1 0)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
778 (if cua--virtual-edges-debug ?. ?\s)) |
67143
cbf6461ecbbd
(cua--highlight-rectangle): Preserve
Kim F. Storm <storm@cua.dk>
parents:
64710
diff
changeset
|
779 'face (or (get-text-property (1- s) 'face) 'default))) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
780 (if (/= pl le) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
781 (setq s (1- s)))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
782 (cond |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
783 ((= cr r) |
56896
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
784 (if (and (/= pr le) |
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
785 (/= cr0 (1- cr)) |
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
786 (or bs (/= cr0 (- cr tab-width))) |
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
787 (/= (mod cr tab-width) 0)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
788 (setq e (1- e)))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
789 ((= cr cl) |
56896
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
790 (setq ms (propertize |
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
791 (make-string |
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
792 (- r l) |
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
793 (if cua--virtual-edges-debug ?, ?\s)) |
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
794 'face rface)) |
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
795 (if (cua--rectangle-right-side) |
69574
e963763ec80a
(cua--highlight-rectangle): Set overlay
Kim F. Storm <storm@cua.dk>
parents:
68648
diff
changeset
|
796 (put-text-property (1- (length ms)) (length ms) 'cursor 2 ms) |
e963763ec80a
(cua--highlight-rectangle): Set overlay
Kim F. Storm <storm@cua.dk>
parents:
68648
diff
changeset
|
797 (put-text-property 0 1 'cursor 2 ms)) |
56896
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
798 (setq bs (concat bs ms)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
799 (setq rface nil)) |
56896
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
800 (t |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
801 (setq as (propertize |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
802 (make-string |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
803 (- r cr0 (if (= le pr) 1 0)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
804 (if cua--virtual-edges-debug ?~ ?\s)) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
805 'face rface)) |
56896
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
806 (if (cua--rectangle-right-side) |
69574
e963763ec80a
(cua--highlight-rectangle): Set overlay
Kim F. Storm <storm@cua.dk>
parents:
68648
diff
changeset
|
807 (put-text-property (1- (length as)) (length as) 'cursor 2 as) |
e963763ec80a
(cua--highlight-rectangle): Set overlay
Kim F. Storm <storm@cua.dk>
parents:
68648
diff
changeset
|
808 (put-text-property 0 1 'cursor 2 as)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
809 (if (/= pr le) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
810 (setq e (1- e)))))))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
811 ;; Trim old leading overlays. |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
812 (while (and old |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
813 (setq overlay (car old)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
814 (< (overlay-start overlay) s) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
815 (/= (overlay-end overlay) e)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
816 (delete-overlay overlay) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
817 (setq old (cdr old))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
818 ;; Reuse an overlay if possible, otherwise create one. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
819 (if (and old |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
820 (setq overlay (car old)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
821 (or (= (overlay-start overlay) s) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
822 (= (overlay-end overlay) e))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
823 (progn |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
824 (move-overlay overlay s e) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
825 (setq old (cdr old))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
826 (setq overlay (make-overlay s e))) |
56896
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
827 (overlay-put overlay 'before-string bs) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
828 (overlay-put overlay 'after-string as) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
829 (overlay-put overlay 'face rface) |
56902
8d62e1b62c44
* emulation/cua-rect.el (cua--overlay-keymap): New keymap for
Kim F. Storm <storm@cua.dk>
parents:
56896
diff
changeset
|
830 (overlay-put overlay 'keymap cua--overlay-keymap) |
64710
0135928f4763
(cua--highlight-rectangle): Only show
Kim F. Storm <storm@cua.dk>
parents:
64701
diff
changeset
|
831 (overlay-put overlay 'window (selected-window)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
832 (setq new (cons overlay new)))))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
833 ;; Trim old trailing overlays. |
84905
47928cf63c6c
(cua--deactivate-rectangle, cua--highlight-rectangle,
Juanma Barranquero <lekktu@gmail.com>
parents:
78218
diff
changeset
|
834 (mapc (function delete-overlay) old) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
835 (setq cua--rectangle-overlays (nreverse new)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
836 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
837 (defun cua--indent-rectangle (&optional ch to-col clear) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
838 ;; Indent current rectangle. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
839 (let ((col (cua--rectangle-insert-col)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
840 (pad (cua--rectangle-virtual-edges)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
841 indent) |
56896
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
842 (cua--rectangle-operation (if clear 'clear 'corners) nil t pad nil |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
843 '(lambda (s e l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
844 (move-to-column col pad) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
845 (if (and (eolp) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
846 (< (current-column) col)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
847 (move-to-column col t)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
848 (cond |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
849 (to-col (indent-to to-col)) |
102915
5200e3730ccd
(cua--indent-rectangle): Insert tabs using
Kim F. Storm <storm@cua.dk>
parents:
100908
diff
changeset
|
850 ((and ch (not (eq ch ?\t))) (insert ch)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
851 (t (tab-to-tab-stop))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
852 (if (cua--rectangle-right-side t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
853 (cua--rectangle-insert-col (current-column)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
854 (setq indent (- (current-column) l)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
855 '(lambda (l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
856 (when (and indent (> indent 0)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
857 (aset cua--rectangle 2 (+ l indent)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
858 (aset cua--rectangle 3 (+ r indent -1))))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
859 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
860 ;; |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
861 ;; rectangle functions / actions |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
862 ;; |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
863 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
864 (defvar cua--rectangle-initialized nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
865 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
866 (defun cua-set-rectangle-mark (&optional reopen) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
867 "Set mark and start in CUA rectangle mode. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
868 With prefix argument, activate previous rectangle if possible." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
869 (interactive "P") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
870 (unless cua--rectangle-initialized |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
871 (cua--init-rectangles)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
872 (when (not cua--rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
873 (if (and reopen |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
874 cua--last-rectangle |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
875 (eq (car cua--last-rectangle) (current-buffer))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
876 (goto-char (car (cdr cua--last-rectangle))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
877 (if (not mark-active) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
878 (push-mark nil nil t))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
879 (cua--activate-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
880 (cua--rectangle-set-corners) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
881 (setq mark-active t |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
882 cua--explicit-region-start t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
883 (if cua-enable-rectangle-auto-help |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
884 (cua-help-for-rectangle t)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
885 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
886 (defun cua-clear-rectangle-mark () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
887 "Cancel current rectangle." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
888 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
889 (when cua--rectangle |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
890 (setq mark-active nil |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
891 cua--explicit-region-start nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
892 (cua--deactivate-rectangle))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
893 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
894 (defun cua-toggle-rectangle-mark () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
895 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
896 (if cua--rectangle |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
897 (cua--deactivate-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
898 (unless cua--rectangle-initialized |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
899 (cua--init-rectangles)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
900 (cua--activate-rectangle)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
901 (if cua--rectangle |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
902 (if cua-enable-rectangle-auto-help |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
903 (cua-help-for-rectangle t)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
904 (if cua-enable-region-auto-help |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
905 (cua-help-for-region t)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
906 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
907 (defun cua-restrict-regexp-rectangle (arg) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
908 "Restrict rectangle to lines (not) matching REGEXP. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
909 With prefix argument, the toggle restriction." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
910 (interactive "P") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
911 (let ((r (cua--rectangle-restriction)) regexp) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
912 (if (and r (null (car (cdr r)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
913 (if arg |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
914 (cua--rectangle-restriction (car r) nil (not (car (cdr (cdr r))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
915 (cua--rectangle-restriction "" nil nil)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
916 (cua--rectangle-restriction |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
917 (read-from-minibuffer "Restrict rectangle (regexp): " |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
918 nil nil nil nil) nil arg)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
919 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
920 (defun cua-restrict-prefix-rectangle (arg) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
921 "Restrict rectangle to lines (not) starting with CHAR. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
922 With prefix argument, the toggle restriction." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
923 (interactive "P") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
924 (let ((r (cua--rectangle-restriction)) regexp) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
925 (if (and r (car (cdr r))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
926 (if arg |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
927 (cua--rectangle-restriction (car r) t (not (car (cdr (cdr r))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
928 (cua--rectangle-restriction "" nil nil)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
929 (cua--rectangle-restriction |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46180
diff
changeset
|
930 (format "[%c]" |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
931 (read-char "Restrictive rectangle (char): ")) t arg)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
932 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
933 (defun cua-move-rectangle-up () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
934 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
935 (cua--rectangle-move 'up)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
936 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
937 (defun cua-move-rectangle-down () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
938 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
939 (cua--rectangle-move 'down)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
940 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
941 (defun cua-move-rectangle-left () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
942 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
943 (cua--rectangle-move 'left)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
944 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
945 (defun cua-move-rectangle-right () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
946 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
947 (cua--rectangle-move 'right)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
948 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
949 (defun cua-copy-rectangle (arg) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
950 (interactive "P") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
951 (setq arg (cua--prefix-arg arg)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
952 (cua--copy-rectangle-as-kill arg) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
953 (if cua-keep-region-after-copy |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
954 (cua--keep-active) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
955 (cua--deactivate))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
956 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
957 (defun cua-cut-rectangle (arg) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
958 (interactive "P") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
959 (if buffer-read-only |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
960 (cua-copy-rectangle arg) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
961 (setq arg (cua--prefix-arg arg)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
962 (goto-char (min (mark) (point))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
963 (cua--copy-rectangle-as-kill arg) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
964 (cua--delete-rectangle)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
965 (cua--deactivate)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
966 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
967 (defun cua-delete-rectangle () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
968 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
969 (goto-char (min (point) (mark))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
970 (if cua-delete-copy-to-register-0 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
971 (set-register ?0 (cua--extract-rectangle))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
972 (cua--delete-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
973 (cua--deactivate)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
974 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
975 (defun cua-rotate-rectangle () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
976 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
977 (cua--rectangle-corner (if (= (cua--rectangle-left) (cua--rectangle-right)) 0 1)) |
56896
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
978 (cua--rectangle-set-corners) |
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
979 (if (cua--rectangle-virtual-edges) |
77bbb90bd021
(cua--rectangle-set-corners): Ensure that
Kim F. Storm <storm@cua.dk>
parents:
56838
diff
changeset
|
980 (setq cua--buffer-and-point-before-command nil))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
981 |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
982 (defun cua-toggle-rectangle-virtual-edges () |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
983 (interactive) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
984 (cua--rectangle-virtual-edges t (not (cua--rectangle-virtual-edges))) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
985 (cua--rectangle-set-corners) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
986 (setq cua--status-string (and (cua--rectangle-virtual-edges) " [R]")) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
987 (cua--keep-active)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
988 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
989 (defun cua-do-rectangle-padding () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
990 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
991 (if buffer-read-only |
63871
ffc4b2e19212
(cua-do-rectangle-padding): Remove period from end of messages.
Juanma Barranquero <lekktu@gmail.com>
parents:
63073
diff
changeset
|
992 (message "Cannot do padding in read-only buffer") |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
993 (cua--rectangle-operation nil nil t t t) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
994 (cua--rectangle-set-corners)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
995 (cua--keep-active)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
996 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
997 (defun cua-open-rectangle () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
998 "Blank out CUA rectangle, shifting text right. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
999 The text previously in the region is not overwritten by the blanks, |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1000 but instead winds up to the right of the rectangle." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1001 (interactive) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1002 (cua--rectangle-operation 'corners nil t 1 nil |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1003 '(lambda (s e l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1004 (skip-chars-forward " \t") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1005 (let ((ws (- (current-column) l)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1006 (p (point))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1007 (skip-chars-backward " \t") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1008 (delete-region (point) p) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1009 (indent-to (+ r ws)))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1010 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1011 (defun cua-close-rectangle (arg) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1012 "Delete all whitespace starting at left edge of CUA rectangle. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1013 On each line in the rectangle, all continuous whitespace starting |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1014 at that column is deleted. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1015 With prefix arg, also delete whitespace to the left of that column." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1016 (interactive "P") |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1017 (cua--rectangle-operation 'clear nil t 1 nil |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1018 '(lambda (s e l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1019 (when arg |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1020 (skip-syntax-backward " " (line-beginning-position)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1021 (setq s (point))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1022 (skip-syntax-forward " " (line-end-position)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1023 (delete-region s (point))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1024 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1025 (defun cua-blank-rectangle () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1026 "Blank out CUA rectangle. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1027 The text previously in the rectangle is overwritten by the blanks." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1028 (interactive) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1029 (cua--rectangle-operation 'keep nil nil 1 nil |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1030 '(lambda (s e l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1031 (goto-char e) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1032 (skip-syntax-forward " " (line-end-position)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1033 (setq e (point)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1034 (let ((column (current-column))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1035 (goto-char s) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1036 (skip-syntax-backward " " (line-beginning-position)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1037 (delete-region (point) e) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1038 (indent-to column))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1039 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1040 (defun cua-align-rectangle () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1041 "Align rectangle lines to left column." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1042 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1043 (let (x) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1044 (cua--rectangle-operation 'clear nil t t nil |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1045 '(lambda (s e l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1046 (let ((b (line-beginning-position))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1047 (skip-syntax-backward "^ " b) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1048 (skip-syntax-backward " " b) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1049 (setq s (point))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1050 (skip-syntax-forward " " (line-end-position)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1051 (delete-region s (point)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1052 (indent-to l)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1053 '(lambda (l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1054 (move-to-column l) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1055 ;; (setq cua-save-point (point)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1056 )))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1057 |
87020
52abd10af81e
(top-level): Move provide to end.
Glenn Morris <rgm@gnu.org>
parents:
84905
diff
changeset
|
1058 (declare-function cua--cut-rectangle-to-global-mark "cua-gmrk" (as-text)) |
52abd10af81e
(top-level): Move provide to end.
Glenn Morris <rgm@gnu.org>
parents:
84905
diff
changeset
|
1059 (declare-function cua--copy-rectangle-to-global-mark "cua-gmrk" (as-text)) |
52abd10af81e
(top-level): Move provide to end.
Glenn Morris <rgm@gnu.org>
parents:
84905
diff
changeset
|
1060 |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1061 (defun cua-copy-rectangle-as-text (&optional arg delete) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1062 "Copy rectangle, but store as normal text." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1063 (interactive "P") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1064 (if cua--global-mark-active |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1065 (if delete |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1066 (cua--cut-rectangle-to-global-mark t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1067 (cua--copy-rectangle-to-global-mark t)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1068 (let* ((rect (cua--extract-rectangle)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1069 (text (mapconcat |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1070 (function (lambda (row) (concat row "\n"))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1071 rect ""))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1072 (setq arg (cua--prefix-arg arg)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1073 (if cua--register |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1074 (set-register cua--register text) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1075 (kill-new text))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1076 (if delete |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1077 (cua--delete-rectangle)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1078 (cua--deactivate))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1079 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1080 (defun cua-cut-rectangle-as-text (arg) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1081 "Kill rectangle, but store as normal text." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1082 (interactive "P") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1083 (cua-copy-rectangle-as-text arg (not buffer-read-only))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1084 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1085 (defun cua-string-rectangle (string) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1086 "Replace CUA rectangle contents with STRING on each line. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1087 The length of STRING need not be the same as the rectangle width." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1088 (interactive "sString rectangle: ") |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1089 (cua--rectangle-operation 'keep nil t t nil |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1090 '(lambda (s e l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1091 (delete-region s e) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1092 (skip-chars-forward " \t") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1093 (let ((ws (- (current-column) l))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1094 (delete-region s (point)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1095 (insert string) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1096 (indent-to (+ (current-column) ws)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1097 (unless (cua--rectangle-restriction) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1098 '(lambda (l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1099 (cua--rectangle-right (max l (+ l (length string) -1))))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1100 |
63871
ffc4b2e19212
(cua-do-rectangle-padding): Remove period from end of messages.
Juanma Barranquero <lekktu@gmail.com>
parents:
63073
diff
changeset
|
1101 (defun cua-fill-char-rectangle (character) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1102 "Replace CUA rectangle contents with CHARACTER." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1103 (interactive "cFill rectangle with character: ") |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1104 (cua--rectangle-operation 'clear nil t 1 nil |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1105 '(lambda (s e l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1106 (delete-region s e) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1107 (move-to-column l t) |
63871
ffc4b2e19212
(cua-do-rectangle-padding): Remove period from end of messages.
Juanma Barranquero <lekktu@gmail.com>
parents:
63073
diff
changeset
|
1108 (insert-char character (- r l))))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1109 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1110 (defun cua-replace-in-rectangle (regexp newtext) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1111 "Replace REGEXP with NEWTEXT in each line of CUA rectangle." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1112 (interactive "sReplace regexp: \nsNew text: ") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1113 (if buffer-read-only |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1114 (message "Cannot replace in read-only buffer") |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1115 (cua--rectangle-operation 'keep nil t 1 nil |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1116 '(lambda (s e l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1117 (if (re-search-forward regexp e t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1118 (replace-match newtext nil nil)))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1119 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1120 (defun cua-incr-rectangle (increment) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1121 "Increment each line of CUA rectangle by prefix amount." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1122 (interactive "p") |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1123 (cua--rectangle-operation 'keep nil t 1 nil |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1124 '(lambda (s e l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1125 (cond |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1126 ((re-search-forward "0x\\([0-9a-fA-F]+\\)" e t) |
108467
114b70461f96
CUA mode: Fix use of `filter-buffer-substring' (rework previous change).
Juanma Barranquero <lekktu@gmail.com>
parents:
107853
diff
changeset
|
1127 (let* ((txt (cua--filter-buffer-noprops (match-beginning 1) (match-end 1))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1128 (n (string-to-number txt 16)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1129 (fmt (format "0x%%0%dx" (length txt)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1130 (replace-match (format fmt (+ n increment))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1131 ((re-search-forward "\\( *-?[0-9]+\\)" e t) |
108467
114b70461f96
CUA mode: Fix use of `filter-buffer-substring' (rework previous change).
Juanma Barranquero <lekktu@gmail.com>
parents:
107853
diff
changeset
|
1132 (let* ((txt (cua--filter-buffer-noprops (match-beginning 1) (match-end 1))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1133 (prefix (if (= (aref txt 0) ?0) "0" "")) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1134 (n (string-to-number txt 10)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1135 (fmt (format "%%%s%dd" prefix (length txt)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1136 (replace-match (format fmt (+ n increment))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1137 (t nil))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1138 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1139 (defvar cua--rectangle-seq-format "%d" |
63871
ffc4b2e19212
(cua-do-rectangle-padding): Remove period from end of messages.
Juanma Barranquero <lekktu@gmail.com>
parents:
63073
diff
changeset
|
1140 "Last format used by `cua-sequence-rectangle'.") |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1141 |
63871
ffc4b2e19212
(cua-do-rectangle-padding): Remove period from end of messages.
Juanma Barranquero <lekktu@gmail.com>
parents:
63073
diff
changeset
|
1142 (defun cua-sequence-rectangle (first incr format) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1143 "Resequence each line of CUA rectangle starting from FIRST. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1144 The numbers are formatted according to the FORMAT string." |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46180
diff
changeset
|
1145 (interactive |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1146 (list (if current-prefix-arg |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1147 (prefix-numeric-value current-prefix-arg) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1148 (string-to-number |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1149 (read-string "Start value: (0) " nil nil "0"))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1150 (string-to-number |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1151 (read-string "Increment: (1) " nil nil "1")) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1152 (read-string (concat "Format: (" cua--rectangle-seq-format ") ")))) |
63871
ffc4b2e19212
(cua-do-rectangle-padding): Remove period from end of messages.
Juanma Barranquero <lekktu@gmail.com>
parents:
63073
diff
changeset
|
1153 (if (= (length format) 0) |
ffc4b2e19212
(cua-do-rectangle-padding): Remove period from end of messages.
Juanma Barranquero <lekktu@gmail.com>
parents:
63073
diff
changeset
|
1154 (setq format cua--rectangle-seq-format) |
ffc4b2e19212
(cua-do-rectangle-padding): Remove period from end of messages.
Juanma Barranquero <lekktu@gmail.com>
parents:
63073
diff
changeset
|
1155 (setq cua--rectangle-seq-format format)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1156 (cua--rectangle-operation 'clear nil t 1 nil |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1157 '(lambda (s e l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1158 (delete-region s e) |
63871
ffc4b2e19212
(cua-do-rectangle-padding): Remove period from end of messages.
Juanma Barranquero <lekktu@gmail.com>
parents:
63073
diff
changeset
|
1159 (insert (format format first)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1160 (setq first (+ first incr))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1161 |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1162 (defmacro cua--convert-rectangle-as (command tabify) |
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1163 `(cua--rectangle-operation 'clear nil nil nil ,tabify |
55264
1a506cc5235d
(cua--convert-rectangle-as): New defmacro.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
1164 '(lambda (s e l r) |
1a506cc5235d
(cua--convert-rectangle-as): New defmacro.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
1165 (,command s e)))) |
1a506cc5235d
(cua--convert-rectangle-as): New defmacro.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
1166 |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1167 (defun cua-upcase-rectangle () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1168 "Convert the rectangle to upper case." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1169 (interactive) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1170 (cua--convert-rectangle-as upcase-region nil)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1171 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1172 (defun cua-downcase-rectangle () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1173 "Convert the rectangle to lower case." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1174 (interactive) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1175 (cua--convert-rectangle-as downcase-region nil)) |
55264
1a506cc5235d
(cua--convert-rectangle-as): New defmacro.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
1176 |
1a506cc5235d
(cua--convert-rectangle-as): New defmacro.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
1177 (defun cua-upcase-initials-rectangle () |
1a506cc5235d
(cua--convert-rectangle-as): New defmacro.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
1178 "Convert the rectangle initials to upper case." |
1a506cc5235d
(cua--convert-rectangle-as): New defmacro.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
1179 (interactive) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1180 (cua--convert-rectangle-as upcase-initials-region nil)) |
55264
1a506cc5235d
(cua--convert-rectangle-as): New defmacro.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
1181 |
1a506cc5235d
(cua--convert-rectangle-as): New defmacro.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
1182 (defun cua-capitalize-rectangle () |
1a506cc5235d
(cua--convert-rectangle-as): New defmacro.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
1183 "Convert the rectangle to proper case." |
1a506cc5235d
(cua--convert-rectangle-as): New defmacro.
Kim F. Storm <storm@cua.dk>
parents:
52401
diff
changeset
|
1184 (interactive) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1185 (cua--convert-rectangle-as capitalize-region nil)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1186 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1187 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1188 ;;; Replace/rearrange text in current rectangle |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1189 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1190 (defun cua--rectangle-aux-replace (width adjust keep replace pad format-fct &optional setup-fct) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1191 ;; Process text inserted by calling SETUP-FCT or current rectangle if nil. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1192 ;; Then call FORMAT-FCT on text (if non-nil); takes two args: start and end. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1193 ;; Fill to WIDTH characters if > 0 or fill to current width if == 0. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1194 ;; Don't fill if WIDTH < 0. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1195 ;; Replace current rectangle by filled text if REPLACE is non-nil |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1196 (let ((auxbuf (get-buffer-create "*CUA temp*")) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1197 (w (if (> width 1) width |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1198 (- (cua--rectangle-right) (cua--rectangle-left) -1))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1199 (r (or setup-fct (cua--extract-rectangle))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1200 y z (tr 0)) |
105829
328150f0cf76
* url-util.el (url-insert-entities-in-string):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102915
diff
changeset
|
1201 (with-current-buffer auxbuf |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1202 (erase-buffer) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1203 (if setup-fct |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1204 (funcall setup-fct) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1205 (cua--insert-rectangle r)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1206 (if format-fct |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1207 (let ((fill-column w)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1208 (funcall format-fct (point-min) (point-max)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1209 (when replace |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1210 (goto-char (point-min)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1211 (while (not (eobp)) |
69901 | 1212 (setq z (cons (filter-buffer-substring (point) (line-end-position)) z)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1213 (forward-line 1)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1214 (if (not cua--debug) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1215 (kill-buffer auxbuf)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1216 (when replace |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1217 (setq z (reverse z)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1218 (if cua--debug |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1219 (print z auxbuf)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1220 (cua--rectangle-operation nil nil t pad nil |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1221 '(lambda (s e l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1222 (let (cc) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1223 (goto-char e) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1224 (skip-chars-forward " \t") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1225 (setq cc (current-column)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1226 (if cua--debug |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1227 (print (list cc s e) auxbuf)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1228 (delete-region s (point)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1229 (if (not z) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1230 (setq y 0) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1231 (move-to-column l t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1232 (insert (car z)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1233 (when (> (current-column) (+ l w)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1234 (setq y (point)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1235 (move-to-column (+ l w) t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1236 (delete-region (point) y) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1237 (setq tr (1+ tr))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1238 (setq z (cdr z))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1239 (if cua--debug |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1240 (print (list (current-column) cc) auxbuf)) |
67407
bb2f67d4e710
(cua--rectangle-aux-replace): Fix
Kim F. Storm <storm@cua.dk>
parents:
67405
diff
changeset
|
1241 (just-one-space 0) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1242 (indent-to cc)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1243 (if (> tr 0) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1244 (message "Warning: Truncated %d row%s" tr (if (> tr 1) "s" ""))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1245 (if adjust |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1246 (cua--rectangle-right (+ (cua--rectangle-left) w -1))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1247 (if keep |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1248 (cua--rectangle-resized))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1249 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1250 (put 'cua--rectangle-aux-replace 'lisp-indent-function 4) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1251 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1252 (defun cua--left-fill-rectangle (start end) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1253 (beginning-of-line) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1254 (while (< (point) (point-max)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1255 (delete-horizontal-space nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1256 (forward-line 1)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1257 (fill-region-as-paragraph (point-min) (point-max) 'left nil) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1258 (untabify (point-min) (point-max))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1259 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1260 (defun cua-text-fill-rectangle (width text) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1261 "Replace rectagle with filled TEXT read from minibuffer. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1262 A numeric prefix argument is used a new width for the filled rectangle." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1263 (interactive (list |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1264 (prefix-numeric-value current-prefix-arg) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1265 (read-from-minibuffer "Enter text: " |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1266 nil nil nil nil))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1267 (cua--rectangle-aux-replace width t t t 1 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1268 'cua--left-fill-rectangle |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1269 '(lambda () (insert text)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1270 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1271 (defun cua-refill-rectangle (width) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1272 "Fill contents of current rectagle. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1273 A numeric prefix argument is used as new width for the filled rectangle." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1274 (interactive "P") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1275 (cua--rectangle-aux-replace |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1276 (if width (prefix-numeric-value width) 0) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1277 t t t 1 'cua--left-fill-rectangle)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1278 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1279 (defun cua-shell-command-on-rectangle (replace command) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1280 "Run shell command on rectangle like `shell-command-on-region'. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1281 With prefix arg, replace rectangle with output from command." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1282 (interactive (list |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1283 current-prefix-arg |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1284 (read-from-minibuffer "Shell command on rectangle: " |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46180
diff
changeset
|
1285 nil nil nil |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1286 'shell-command-history))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1287 (cua--rectangle-aux-replace -1 t t replace 1 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1288 '(lambda (s e) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1289 (shell-command-on-region s e command |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1290 replace replace nil)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1291 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1292 (defun cua-reverse-rectangle () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1293 "Reverse the lines of the rectangle." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1294 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1295 (cua--rectangle-aux-replace 0 t t t t 'reverse-region)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1296 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1297 (defun cua-scroll-rectangle-up () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1298 "Remove the first line of the rectangle and scroll remaining lines up." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1299 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1300 (cua--rectangle-aux-replace 0 t t t t |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46180
diff
changeset
|
1301 '(lambda (s e) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1302 (if (= (forward-line 1) 0) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1303 (delete-region s (point)))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1304 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1305 (defun cua-scroll-rectangle-down () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1306 "Insert a blank line at the first line of the rectangle. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1307 The remaining lines are scrolled down, losing the last line." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1308 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1309 (cua--rectangle-aux-replace 0 t t t t |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1310 '(lambda (s e) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1311 (goto-char s) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1312 (insert "\n")))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1313 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1314 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1315 ;;; Insert/delete text to left or right of rectangle |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1316 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1317 (defun cua-insert-char-rectangle (&optional ch) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1318 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1319 (if buffer-read-only |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1320 (ding) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1321 (cua--indent-rectangle (or ch (aref (this-single-command-keys) 0))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1322 (cua--keep-active)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1323 t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1324 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1325 (defun cua-indent-rectangle (column) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1326 "Indent rectangle to next tab stop. |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1327 With prefix arg, indent to that column." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1328 (interactive "P") |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1329 (if (null column) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1330 (cua-insert-char-rectangle ?\t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1331 (cua--indent-rectangle nil (prefix-numeric-value column)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1332 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1333 (defun cua-delete-char-rectangle () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1334 "Delete char to left or right of rectangle." |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1335 (interactive) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1336 (let ((col (cua--rectangle-insert-col)) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1337 (pad (cua--rectangle-virtual-edges)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1338 indent) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1339 (cua--rectangle-operation 'corners nil t pad nil |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1340 '(lambda (s e l r) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46180
diff
changeset
|
1341 (move-to-column |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1342 (if (cua--rectangle-right-side t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1343 (max (1+ r) col) l) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1344 pad) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1345 (if (bolp) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1346 nil |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1347 (delete-backward-char 1) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1348 (if (cua--rectangle-right-side t) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1349 (cua--rectangle-insert-col (current-column)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1350 (setq indent (- l (current-column)))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1351 '(lambda (l r) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1352 (when (and indent (> indent 0)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1353 (aset cua--rectangle 2 (- l indent)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1354 (aset cua--rectangle 3 (- r indent 1))))))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1355 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1356 (defun cua-help-for-rectangle (&optional help) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1357 (interactive) |
67405
f8d3bd39d0a1
* emulation/cua-base.el (cua-use-hyper-key): Replaced by ...
Kim F. Storm <storm@cua.dk>
parents:
67399
diff
changeset
|
1358 (let ((M (cond ((eq cua--rectangle-modifier-key 'hyper) " H-") |
f8d3bd39d0a1
* emulation/cua-base.el (cua-use-hyper-key): Replaced by ...
Kim F. Storm <storm@cua.dk>
parents:
67399
diff
changeset
|
1359 ((eq cua--rectangle-modifier-key 'super) " s-") |
71906
4a6411420a60
(cua-help-for-rectangle): Add `alt' modifier.
Kim F. Storm <storm@cua.dk>
parents:
69901
diff
changeset
|
1360 ((eq cua--rectangle-modifier-key 'alt) " A-") |
67405
f8d3bd39d0a1
* emulation/cua-base.el (cua-use-hyper-key): Replaced by ...
Kim F. Storm <storm@cua.dk>
parents:
67399
diff
changeset
|
1361 (t " M-")))) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46180
diff
changeset
|
1362 (message |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1363 (concat (if help "C-?:help" "") |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46180
diff
changeset
|
1364 M "p:pad" M "o:open" M "c:close" M "b:blank" |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1365 M "s:string" M "f:fill" M "i:incr" M "n:seq")))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1366 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1367 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1368 ;;; CUA-like cut & paste for rectangles |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1369 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1370 (defun cua--cancel-rectangle () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1371 ;; Cancel rectangle |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1372 (if cua--rectangle |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1373 (cua--deactivate-rectangle)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1374 (setq cua--last-rectangle nil)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1375 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1376 (defun cua--rectangle-post-command () |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1377 (if cua--restored-rectangle |
59973
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
1378 (progn |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
1379 (setq cua--rectangle cua--restored-rectangle |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
1380 cua--restored-rectangle nil |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
1381 mark-active t |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
1382 deactivate-mark nil) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
1383 (cua--rectangle-set-corners)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1384 (when (and cua--rectangle cua--buffer-and-point-before-command |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1385 (equal (car cua--buffer-and-point-before-command) (current-buffer)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1386 (not (= (cdr cua--buffer-and-point-before-command) (point)))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1387 (if (cua--rectangle-right-side) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1388 (cua--rectangle-right (current-column)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1389 (cua--rectangle-left (current-column))) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1390 (if (>= (cua--rectangle-corner) 2) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1391 (cua--rectangle-bot t) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1392 (cua--rectangle-top t)))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1393 (if cua--rectangle |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1394 (if (and mark-active |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1395 (not deactivate-mark)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1396 (cua--highlight-rectangle) |
67214
4fd503f32b2c
(cua--rectangle-overlays): Make permanent-local.
Kim F. Storm <storm@cua.dk>
parents:
67143
diff
changeset
|
1397 (cua--deactivate-rectangle)) |
4fd503f32b2c
(cua--rectangle-overlays): Make permanent-local.
Kim F. Storm <storm@cua.dk>
parents:
67143
diff
changeset
|
1398 (when cua--rectangle-overlays |
4fd503f32b2c
(cua--rectangle-overlays): Make permanent-local.
Kim F. Storm <storm@cua.dk>
parents:
67143
diff
changeset
|
1399 ;; clean-up after revert-buffer |
84905
47928cf63c6c
(cua--deactivate-rectangle, cua--highlight-rectangle,
Juanma Barranquero <lekktu@gmail.com>
parents:
78218
diff
changeset
|
1400 (mapc (function delete-overlay) cua--rectangle-overlays) |
67214
4fd503f32b2c
(cua--rectangle-overlays): Make permanent-local.
Kim F. Storm <storm@cua.dk>
parents:
67143
diff
changeset
|
1401 (setq cua--rectangle-overlays nil) |
4fd503f32b2c
(cua--rectangle-overlays): Make permanent-local.
Kim F. Storm <storm@cua.dk>
parents:
67143
diff
changeset
|
1402 (setq deactivate-mark t))) |
59973
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
1403 (when cua--rect-undo-set-point |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
1404 (goto-char cua--rect-undo-set-point) |
b1a9da0dcd80
(cua--undo-list, cua--tidy-undo-counter)
Kim F. Storm <storm@cua.dk>
parents:
57075
diff
changeset
|
1405 (setq cua--rect-undo-set-point nil))) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1406 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1407 ;;; Initialization |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1408 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1409 (defun cua--rect-M/H-key (key cmd) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1410 (cua--M/H-key cua--rectangle-keymap key cmd)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1411 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1412 (defun cua--init-rectangles () |
69669 | 1413 (define-key cua--rectangle-keymap cua-rectangle-mark-key 'cua-clear-rectangle-mark) |
1414 (define-key cua--region-keymap cua-rectangle-mark-key 'cua-toggle-rectangle-mark) | |
67405
f8d3bd39d0a1
* emulation/cua-base.el (cua-use-hyper-key): Replaced by ...
Kim F. Storm <storm@cua.dk>
parents:
67399
diff
changeset
|
1415 (unless (eq cua--rectangle-modifier-key 'meta) |
f8d3bd39d0a1
* emulation/cua-base.el (cua-use-hyper-key): Replaced by ...
Kim F. Storm <storm@cua.dk>
parents:
67399
diff
changeset
|
1416 (cua--rect-M/H-key ?\s 'cua-clear-rectangle-mark) |
f8d3bd39d0a1
* emulation/cua-base.el (cua-use-hyper-key): Replaced by ...
Kim F. Storm <storm@cua.dk>
parents:
67399
diff
changeset
|
1417 (cua--M/H-key cua--region-keymap ?\s 'cua-toggle-rectangle-mark)) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1418 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1419 (define-key cua--rectangle-keymap [remap copy-region-as-kill] 'cua-copy-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1420 (define-key cua--rectangle-keymap [remap kill-ring-save] 'cua-copy-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1421 (define-key cua--rectangle-keymap [remap kill-region] 'cua-cut-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1422 (define-key cua--rectangle-keymap [remap delete-char] 'cua-delete-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1423 (define-key cua--rectangle-keymap [remap set-mark-command] 'cua-toggle-rectangle-mark) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1424 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1425 (define-key cua--rectangle-keymap [remap forward-char] 'cua-resize-rectangle-right) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1426 (define-key cua--rectangle-keymap [remap backward-char] 'cua-resize-rectangle-left) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1427 (define-key cua--rectangle-keymap [remap next-line] 'cua-resize-rectangle-down) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1428 (define-key cua--rectangle-keymap [remap previous-line] 'cua-resize-rectangle-up) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1429 (define-key cua--rectangle-keymap [remap end-of-line] 'cua-resize-rectangle-eol) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1430 (define-key cua--rectangle-keymap [remap beginning-of-line] 'cua-resize-rectangle-bol) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1431 (define-key cua--rectangle-keymap [remap end-of-buffer] 'cua-resize-rectangle-bot) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1432 (define-key cua--rectangle-keymap [remap beginning-of-buffer] 'cua-resize-rectangle-top) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1433 (define-key cua--rectangle-keymap [remap scroll-down] 'cua-resize-rectangle-page-up) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1434 (define-key cua--rectangle-keymap [remap scroll-up] 'cua-resize-rectangle-page-down) |
107853
de5ba6f3514c
Bind `C-v' to `scroll-up-command' and `M-v' to `scroll-down-command'.
Juri Linkov <juri@jurta.org>
parents:
106815
diff
changeset
|
1435 (define-key cua--rectangle-keymap [remap scroll-down-command] 'cua-resize-rectangle-page-up) |
de5ba6f3514c
Bind `C-v' to `scroll-up-command' and `M-v' to `scroll-down-command'.
Juri Linkov <juri@jurta.org>
parents:
106815
diff
changeset
|
1436 (define-key cua--rectangle-keymap [remap scroll-up-command] 'cua-resize-rectangle-page-down) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1437 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1438 (define-key cua--rectangle-keymap [remap delete-backward-char] 'cua-delete-char-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1439 (define-key cua--rectangle-keymap [remap backward-delete-char] 'cua-delete-char-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1440 (define-key cua--rectangle-keymap [remap backward-delete-char-untabify] 'cua-delete-char-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1441 (define-key cua--rectangle-keymap [remap self-insert-command] 'cua-insert-char-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1442 (define-key cua--rectangle-keymap [remap self-insert-iso] 'cua-insert-char-rectangle) |
49598
0d8b17d428b5
Trailing whitepace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46180
diff
changeset
|
1443 |
45504
3ddab99699f4
(cua--init-rectangles): Install default
Kim F. Storm <storm@cua.dk>
parents:
45318
diff
changeset
|
1444 ;; Catch self-inserting characters which are "stolen" by other modes |
3ddab99699f4
(cua--init-rectangles): Install default
Kim F. Storm <storm@cua.dk>
parents:
45318
diff
changeset
|
1445 (define-key cua--rectangle-keymap [t] |
3ddab99699f4
(cua--init-rectangles): Install default
Kim F. Storm <storm@cua.dk>
parents:
45318
diff
changeset
|
1446 '(menu-item "sic" cua-insert-char-rectangle :filter cua--self-insert-char-p)) |
3ddab99699f4
(cua--init-rectangles): Install default
Kim F. Storm <storm@cua.dk>
parents:
45318
diff
changeset
|
1447 |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1448 (define-key cua--rectangle-keymap "\r" 'cua-rotate-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1449 (define-key cua--rectangle-keymap "\t" 'cua-indent-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1450 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1451 (define-key cua--rectangle-keymap [(control ??)] 'cua-help-for-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1452 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1453 (define-key cua--rectangle-keymap [mouse-1] 'cua-mouse-set-rectangle-mark) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1454 (define-key cua--rectangle-keymap [down-mouse-1] 'cua--mouse-ignore) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1455 (define-key cua--rectangle-keymap [drag-mouse-1] 'cua--mouse-ignore) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1456 (define-key cua--rectangle-keymap [mouse-3] 'cua-mouse-save-then-kill-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1457 (define-key cua--rectangle-keymap [down-mouse-3] 'cua--mouse-ignore) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1458 (define-key cua--rectangle-keymap [drag-mouse-3] 'cua--mouse-ignore) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1459 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1460 (cua--rect-M/H-key 'up 'cua-move-rectangle-up) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1461 (cua--rect-M/H-key 'down 'cua-move-rectangle-down) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1462 (cua--rect-M/H-key 'left 'cua-move-rectangle-left) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1463 (cua--rect-M/H-key 'right 'cua-move-rectangle-right) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1464 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1465 (cua--rect-M/H-key '(control up) 'cua-scroll-rectangle-up) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1466 (cua--rect-M/H-key '(control down) 'cua-scroll-rectangle-down) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1467 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1468 (cua--rect-M/H-key ?a 'cua-align-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1469 (cua--rect-M/H-key ?b 'cua-blank-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1470 (cua--rect-M/H-key ?c 'cua-close-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1471 (cua--rect-M/H-key ?f 'cua-fill-char-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1472 (cua--rect-M/H-key ?i 'cua-incr-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1473 (cua--rect-M/H-key ?k 'cua-cut-rectangle-as-text) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1474 (cua--rect-M/H-key ?l 'cua-downcase-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1475 (cua--rect-M/H-key ?m 'cua-copy-rectangle-as-text) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1476 (cua--rect-M/H-key ?n 'cua-sequence-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1477 (cua--rect-M/H-key ?o 'cua-open-rectangle) |
56838
c1345747d0db
(cua--rectangle-padding): Remove.
Kim F. Storm <storm@cua.dk>
parents:
55264
diff
changeset
|
1478 (cua--rect-M/H-key ?p 'cua-toggle-rectangle-virtual-edges) |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1479 (cua--rect-M/H-key ?P 'cua-do-rectangle-padding) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1480 (cua--rect-M/H-key ?q 'cua-refill-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1481 (cua--rect-M/H-key ?r 'cua-replace-in-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1482 (cua--rect-M/H-key ?R 'cua-reverse-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1483 (cua--rect-M/H-key ?s 'cua-string-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1484 (cua--rect-M/H-key ?t 'cua-text-fill-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1485 (cua--rect-M/H-key ?u 'cua-upcase-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1486 (cua--rect-M/H-key ?| 'cua-shell-command-on-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1487 (cua--rect-M/H-key ?' 'cua-restrict-prefix-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1488 (cua--rect-M/H-key ?/ 'cua-restrict-regexp-rectangle) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1489 |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1490 (setq cua--rectangle-initialized t)) |
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1491 |
87020
52abd10af81e
(top-level): Move provide to end.
Glenn Morris <rgm@gnu.org>
parents:
84905
diff
changeset
|
1492 (provide 'cua-rect) |
52abd10af81e
(top-level): Move provide to end.
Glenn Morris <rgm@gnu.org>
parents:
84905
diff
changeset
|
1493 |
93975
1e3a407766b9
Fix up comment convention on the arch-tag lines.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1494 ;; arch-tag: b730df53-17b9-4a89-bd63-4a71ec196731 |
44938
358d42530d42
Added cua-mode based files [split from original cua.el]:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1495 ;;; cua-rect.el ends here |