;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
;;; Commentary:
;;; Code:
+;;;###autoload
+(defun move-to-column-force (column)
+ "Move point to column COLUMN rigidly in the current line.
+If COLUMN is within a multi-column character, replace it by
+spaces and tab."
+ (let ((col (move-to-column column t)))
+ (if (> col column)
+ (let (pos)
+ (delete-char -1)
+ (insert-char ? (- column (current-column)))
+ (setq pos (point))
+ (indent-to col)
+ (goto-char pos)))
+ column))
+
+;; extract-rectangle-line stores lines into this list
+;; to accumulate them for extract-rectangle and delete-extract-rectangle.
+(defvar operate-on-rectangle-lines)
+
(defun operate-on-rectangle (function start end coerce-tabs)
"Call FUNCTION for each line of rectangle with corners at START, END.
If COERCE-TABS is non-nil, convert multi-column characters
(goto-char startlinepos)
(while (< (point) endlinepos)
(let (startpos begextra endextra)
- (move-to-column startcol coerce-tabs)
+ (if coerce-tabs
+ (move-to-column-force startcol)
+ (move-to-column startcol))
(setq begextra (- (current-column) startcol))
(setq startpos (point))
- (move-to-column endcol coerce-tabs)
+ (if coerce-tabs
+ (move-to-column-force endcol)
+ (move-to-column endcol))
+ ;; If we overshot, move back one character
+ ;; so that endextra will be positive.
+ (if (and (not coerce-tabs) (> (current-column) endcol))
+ (backward-char 1))
(setq endextra (- endcol (current-column)))
(if (< begextra 0)
(setq endextra (+ endextra begextra)
(setq line (concat (spaces-string begextra)
line
(spaces-string endextra))))
- (setq lines (cons line lines))))
+ (setq operate-on-rectangle-lines (cons line operate-on-rectangle-lines))))
(defconst spaces-strings
'["" " " " " " " " " " " " " " " " "])
"Delete contents of rectangle and return it as a list of strings.
Arguments START and END are the corners of the rectangle.
The value is list of strings, one for each line of the rectangle."
- (let (lines)
+ (let (operate-on-rectangle-lines)
(operate-on-rectangle 'delete-extract-rectangle-line
start end t)
- (nreverse lines)))
+ (nreverse operate-on-rectangle-lines)))
;;;###autoload
(defun extract-rectangle (start end)
"Return contents of rectangle with corners at START and END.
Value is list of strings, one for each line of the rectangle."
- (let (lines)
+ (let (operate-on-rectangle-lines)
(operate-on-rectangle 'extract-rectangle-line start end nil)
- (nreverse lines)))
+ (nreverse operate-on-rectangle-lines)))
(defvar killed-rectangle nil
"Rectangle for yank-rectangle to insert.")
Calling from program, supply two args START and END, buffer positions.
But in programs you might prefer to use `delete-extract-rectangle'."
(interactive "r")
+ (if buffer-read-only
+ (progn
+ (setq killed-rectangle (extract-rectangle start end))
+ (barf-if-buffer-read-only)))
(setq killed-rectangle (delete-extract-rectangle start end)))
;;;###autoload
(progn
(forward-line 1)
(or (bolp) (insert ?\n))
- (move-to-column insertcolumn t)))
+ (move-to-column-force insertcolumn)))
(setq first nil)
(insert (car lines))
(setq lines (cdr lines)))))
(goto-char startpos)
;; Column where rectangle begins.
(let ((begcol (- (current-column) begextra)))
+ (if (> begextra 0)
+ (move-to-column-force begcol))
(skip-chars-forward " \t")
;; Width of whitespace to be deleted and recreated.
(setq whitewidth (- (current-column) begcol)))
;; Open the desired width, plus same amount of whitespace we just deleted.
(indent-to (+ endcol whitewidth))))
+;;;###autoload (defalias 'close-rectangle 'delete-whitespace-rectangle) ;; Old name
+;;;###autoload
+(defun delete-whitespace-rectangle (start end)
+ "Delete all whitespace following a specified column in each line.
+The left edge of the rectangle specifies the position in each line
+at which whitespace deletion should begin. On each line in the
+rectangle, all continuous whitespace starting at that column is deleted."
+ (interactive "r")
+ (operate-on-rectangle '(lambda (startpos begextra endextra)
+ (save-excursion
+ (goto-char startpos)
+ (delete-region (point)
+ (progn
+ (skip-syntax-forward " ")
+ (point)))))
+ start end t))
+
+;; string-rectangle uses this variable to pass the string
+;; to string-rectangle-line.
+(defvar string-rectangle-string)
+
;;;###autoload
(defun string-rectangle (start end string)
- "Insert STRING on each line of the region-rectangle, shifting text right.
-The left edge of the rectangle specifies the column for insertion.
-This command does not delete or overwrite any existing text.
+ "Replace rectangle contents with STRING on each line.
+The length of STRING need not be the same as the rectangle width.
Called from a program, takes three args; START, END and STRING."
(interactive "r\nsString rectangle: ")
- (operate-on-rectangle 'string-rectangle-line start end t)
- (goto-char start))
+ (let ((string-rectangle-string string))
+ (operate-on-rectangle 'string-rectangle-line start end t)))
(defun string-rectangle-line (startpos begextra endextra)
(let (whitespace)
- (goto-char startpos)
+ ;; Delete the width of the rectangle.
+ (delete-region startpos (point))
;; Compute horizontal width of following whitespace.
(let ((ocol (current-column)))
(skip-chars-forward " \t")
;; Delete the following whitespace.
(delete-region startpos (point))
;; Insert the desired string.
- (insert string)
+ (insert string-rectangle-string)
;; Insert the same width of whitespace that we had before.
(indent-to (+ (current-column) whitespace))))
HCoop / bpt / emacs.git / blobdiff