xemacs-beta: lisp/rect.el comparison

comparison lisp/rect.el @ 412:697ef44129c6 r21-2-14

Import from CVS: tag r21-2-14

author	cvs
date	Mon, 13 Aug 2007 11:20:41 +0200
parents	de805c49cfc1
children	95016f13131a

comparison

equal deleted inserted replaced

-:12e008d41344
+:697ef44129c6
 ;;; rect.el --- rectangle functions for XEmacs.
-;; Copyright (C) 1985-2000 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1993, 1994 Free Software Foundation, Inc.
-;; Maintainer: Didier Verna <didier@xemacs.org>
+;; Maintainer: FSF
 ;; Keywords: internal
 ;; This file is part of XEmacs.
 ;; XEmacs is free software; you can redistribute it and/or modify it
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the Free
 ;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ;; 02111-1307, USA.
-;;; Synched up with: to be incorporated in a forthcoming GNU Emacs
+;;; Synched up with: FSF 19.34.
 ;;; Commentary:
-;; This package provides the operations on rectangles that are documented
+;; This package provides the operations on rectangles that are ocumented
 ;; in the XEmacs Reference Manual.
-;; #### NOTE: this file has been almost completely rewritten by Didier Verna
-;; <didier@xemacs.org>, Jul 99. The purpose of this rewrite is to be less
-;; intrusive and fill lines with whitespaces only when needed. A few functions
-;; are untouched though, as noted above their definition.
 ;;; Code:
-;; #### NOTE: this function is untouched, but not used anymore.
-;; `apply-on-rectangle' is used instead. It's still there because it's
-;; documented so people might use it in their code, so I've decided not to
-;; touch it. --dv
 ;; XEmacs: extra-args
 (defun operate-on-rectangle (function start end coerce-tabs &rest extra-args)
 "Call FUNCTION for each line of rectangle with corners at START, END.
 If COERCE-TABS is non-nil, convert multi-column characters
 that span the starting or ending columns on any line
 number of columns that belong to rectangle but are before that position,
 number of columns that belong to rectangle but are after point.
 Point is at the end of the segment of this line within the rectangle."
 (let (startcol startlinepos endcol endlinepos)
 (save-excursion
 (goto-char start)
 (setq startcol (current-column))
 (beginning-of-line)
 (setq startlinepos (point)))
 (save-excursion
 (goto-char end)
 (setq endcol (current-column))
 (forward-line 1)
 (setq endlinepos (point-marker)))
 (if (< endcol startcol)
 	;; XEmacs
 	(let ((tem startcol))
 	  (setq startcol endcol endcol tem)))
 (save-excursion
 	  (if (< endextra 0) (setq endextra 0))
 	  (apply function startpos begextra endextra extra-args))
 	(forward-line 1)))
 (- endcol startcol)))
-;; The replacement for `operate-on-rectangle' -- dv
+(defun delete-rectangle-line (startdelpos ignore ignore)
-(defun apply-on-rectangle (function start end &rest args)
+(delete-region startdelpos (point)))
-"Call FUNCTION for each line of rectangle with corners at START and END.
-FUNCTION is called with two arguments: the start and end columns of the
+;; XEmacs: added lines arg
-rectangle, plus ARGS extra arguments. Point is at the beginning of line
+(defun delete-extract-rectangle-line (startdelpos begextra endextra lines)
-when the function is called."
+(save-excursion
-(let (startcol startpt endcol endpt)
+(extract-rectangle-line startdelpos begextra endextra lines))
-(save-excursion
+(delete-region startdelpos (point)))
-(goto-char start)
-(setq startcol (current-column))
+;; XEmacs: added lines arg
-(beginning-of-line)
+(defun extract-rectangle-line (startdelpos begextra endextra lines)
-(setq startpt (point))
+(let ((line (buffer-substring startdelpos (point)))
-(goto-char end)
+	(end (point)))
-(setq endcol (current-column))
+(goto-char startdelpos)
-(forward-line 1)
+(while (search-forward "\t" end t)
-(setq endpt (point-marker))
+(let ((width (- (current-column)
-;; ensure the start column is the left one.
+		      (save-excursion (forward-char -1)
-(if (< endcol startcol)
+				      (current-column)))))
-	  (let ((col startcol))
+	(setq line (concat (substring line 0 (- (point) end 1))
-	    (setq startcol endcol endcol col)))
+			   (spaces-string width)
-;; start looping over lines
+			   (substring line (+ (length line) (- (point) end)))))))
-(goto-char startpt)
+(if (or (> begextra 0) (> endextra 0))
-(while (< (point) endpt)
+	(setq line (concat (spaces-string begextra)
-	(apply function startcol endcol args)
+			   line
-	(forward-line 1)))
+			   (spaces-string endextra))))
-))
+(setcdr lines (cons line (cdr lines))))) ; XEmacs
+(defconst spaces-strings
-(defun delete-rectangle-line (startcol endcol fill)
+(purecopy '["" " " "  " "   " "    " "     " "      " "       " "        "]))
-(let ((pt (point-at-eol)))
-(when (= (move-to-column startcol (or fill 'coerce)) startcol)
-(if (and (not fill) (<= pt endcol))
-	  (delete-region (point) pt)
-	;; else
-	(setq pt (point))
-	(move-to-column endcol t)
-	(delete-region pt (point))))
-))
-;;;###autoload
-(defun delete-rectangle (start end &optional fill)
-"Delete the text in the region-rectangle without saving it.
-The same range of columns is deleted in each line starting with the line
-where the region begins and ending with the line where the region ends.
-When called from a program, the rectangle's corners are START and END.
-With a prefix (or FILL) argument, also fill lines where nothing has to be
-deleted."
-(interactive "*r\nP")
-(apply-on-rectangle 'delete-rectangle-line start end fill))
-;; I love ascii art ;-)
-(defconst spaces-strings '[""
-			   " "
-			   "  "
-			   "   "
-			   "    "
-			   "     "
-			   "      "
-			   "       "
-			   "        "])
-;; This function is untouched --dv
 (defun spaces-string (n)
 (if (<= n 8) (aref spaces-strings n)
 (let ((val ""))
 (while (> n 8)
 	(setq val (concat "        " val)
 	      n (- n 8)))
 (concat val (aref spaces-strings n)))))
+;;;###autoload
-(defun delete-extract-rectangle-line (startcol endcol lines fill)
+(defun delete-rectangle (start end)
-(let ((pt (point-at-eol)))
+"Delete (don't save) text in rectangle with point and mark as corners.
-(if (< (move-to-column startcol (or fill 'coerce)) startcol)
+The same range of columns is deleted in each line starting with the line
-	(setcdr lines (cons (spaces-string (- endcol startcol))
+where the region begins and ending with the line where the region ends."
-			    (cdr lines)))
+(interactive "r")
-;; else
+(operate-on-rectangle 'delete-rectangle-line start end t))
-(setq pt (point))
-(move-to-column endcol t)
+;;;###autoload
-(setcdr lines (cons (buffer-substring pt (point)) (cdr lines)))
+(defun delete-extract-rectangle (start end)
-(delete-region pt (point)))
+"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."
-;;;###autoload
+(let ((lines (list nil))) ; XEmacs change
-(defun delete-extract-rectangle (start end &optional fill)
+(operate-on-rectangle 'delete-extract-rectangle-line
-"Delete the contents of the rectangle with corners at START and END, and
+			  start end t lines)
-return it as a list of strings, one for each line of the rectangle.
-With an optional FILL argument, also fill lines where nothing has to be
-deleted."
-(let ((lines (list nil)))
-(apply-on-rectangle 'delete-extract-rectangle-line start end lines fill)
 (nreverse (cdr lines))))
-;; #### NOTE: this is actually the only function that needs to do complicated
-;; stuff like what's happening in `operate-on-rectangle', because the buffer
-;; might be read-only. --dv
-(defun extract-rectangle-line (startcol endcol lines)
-(let (start end begextra endextra line)
-(move-to-column startcol)
-(setq start (point)
-	  begextra (- (current-column) startcol))
-(move-to-column endcol)
-(setq end (point)
-	  endextra (- endcol (current-column)))
-(setq line (buffer-substring start (point)))
-(if (< begextra 0)
-	(setq endextra (+ endextra begextra)
-	      begextra 0))
-(if (< endextra 0)
-	(setq endextra 0))
-(goto-char start)
-(while (search-forward "\t" end t)
-(let ((width (- (current-column)
-		      (save-excursion (forward-char -1)
-				      (current-column)))))
-	(setq line (concat (substring line 0 (- (point) end 1))
-			   (spaces-string width)
-			   (substring line (+ (length line)
-					      (- (point) end)))))))
-(if (or (> begextra 0) (> endextra 0))
-	(setq line (concat (spaces-string begextra)
-			   line
-			   (spaces-string endextra))))
-(setcdr lines (cons line (cdr lines)))))
 ;;;###autoload
 (defun extract-rectangle (start end)
-"Return the contents of the rectangle with corners at START and END,
+"Return contents of rectangle with corners at START and END.
-as a list of strings, one for each line of the rectangle."
+Value is list of strings, one for each line of the rectangle."
-(let ((lines (list nil)))
+(let ((lines (list nil))) ; XEmacs change
-(apply-on-rectangle 'extract-rectangle-line start end lines)
+(operate-on-rectangle 'extract-rectangle-line start end nil lines)
 (nreverse (cdr lines))))
 ;;;###autoload
 (defvar killed-rectangle nil
-"Rectangle for `yank-rectangle' to insert.")
+"Rectangle for yank-rectangle to insert.")
 ;;;###autoload
-(defun kill-rectangle (start end &optional fill)
+(defun kill-rectangle (start end)
-"Delete the region-rectangle and save it as the last killed one.
+"Delete rectangle with corners at point and mark; save as last killed one.
-You might prefer to use `delete-extract-rectangle' from a program.
+Calling from program, supply two args START and END, buffer positions.
+But in programs you might prefer to use `delete-extract-rectangle'."
-When called from a program, the rectangle's corners are START and END.
+(interactive "r")
-With a prefix (or FILL) argument, also fill lines where nothing has to be
+(if buffer-read-only
-deleted."
+(progn
-(interactive "*r\nP")
+	(setq killed-rectangle (extract-rectangle start end))
-(when buffer-read-only
+	(barf-if-buffer-read-only)))
-(setq killed-rectangle (extract-rectangle start end))
+(setq killed-rectangle (delete-extract-rectangle start end)))
-(barf-if-buffer-read-only))
-(setq killed-rectangle (delete-extract-rectangle start end fill)))
-;; This function is untouched --dv
 ;;;###autoload
 (defun yank-rectangle ()
 "Yank the last killed rectangle with upper left corner at point."
-(interactive "*")
+(interactive)
 (insert-rectangle killed-rectangle))
-;; This function is untouched --dv
 ;;;###autoload
 (defun insert-rectangle (rectangle)
 "Insert text of RECTANGLE with upper left corner at point.
 RECTANGLE's first line is inserted at point, its second
 line is inserted at a point vertically under point, etc.
 	(first t))
 (push-mark)
 (while lines
 (or first
 	  (progn
-	    (forward-line 1)
+	   (forward-line 1)
-	    (or (bolp) (insert ?\n))
+	   (or (bolp) (insert ?\n))
-	    (move-to-column insertcolumn t)))
+	   (move-to-column insertcolumn t)))
 (setq first nil)
 (insert (car lines))
 (setq lines (cdr lines)))))
+;;;###autoload
-(defun open-rectangle-line (startcol endcol fill)
+(defun open-rectangle (start end)
-(when (= (move-to-column startcol (or fill 'coerce)) startcol)
+"Blank out rectangle with corners at point and mark, shifting text right.
-(unless (and (not fill)
+The text previously in the region is not overwritten by the blanks,
-		 (= (point) (point-at-eol)))
+but instead winds up to the right of the rectangle."
-(indent-to endcol))))
+(interactive "r")
+(operate-on-rectangle 'open-rectangle-line start end nil)
-;;;###autoload
-(defun open-rectangle (start end &optional fill)
-"Blank out the region-rectangle, shifting text right.
-When called from a program, the rectangle's corners are START and END.
-With a prefix (or FILL) argument, fill with blanks even if there is no text
-on the right side of the rectangle."
-(interactive "*r\nP")
-(apply-on-rectangle 'open-rectangle-line start end fill)
 (goto-char start))
+(defun open-rectangle-line (startpos begextra endextra)
-(defun string-rectangle-line (startcol endcol string delete)
+;; Column where rectangle ends.
-(move-to-column startcol t)
+(let ((endcol (+ (current-column) endextra))
-(if delete
+	whitewidth)
-(delete-rectangle-line startcol endcol nil))
+(goto-char startpos)
-(insert string))
+;; Column where rectangle begins.
+(let ((begcol (- (current-column) begextra)))
+(skip-chars-forward " \t")
+;; Width of whitespace to be deleted and recreated.
+(setq whitewidth (- (current-column) begcol)))
+;; Delete the whitespace following the start column.
+(delete-region startpos (point))
+;; Open the desired width, plus same amount of whitespace we just deleted.
+(indent-to (+ endcol whitewidth))))
 ;;;###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.
-If `pending-delete-mode' is active the string replace the region.
-Otherwise this command does not delete or overwrite any existing text.
+Called from a program, takes three args; START, END and STRING."
+(interactive "r\nsString rectangle: ")
-When called from a program, the rectangle's corners are START and END."
+(operate-on-rectangle 'string-rectangle-line start end t string)) ; XEmacs
-(interactive "*r\nsString rectangle: ")
-(defvar pending-delete-mode)
+;; XEmacs: add string arg
-(apply-on-rectangle 'string-rectangle-line start end string
+(defun string-rectangle-line (startpos begextra endextra string)
-(and (boundp 'pending-delete-mode) pending-delete-mode)))
+(let (whitespace)
+(goto-char startpos)
-(defun replace-rectangle (start end string)
+;; Compute horizontal width of following whitespace.
-"Like `string-rectangle', but unconditionally replace the original region,
+(let ((ocol (current-column)))
-as if `pending-delete-mode' were active."
+(skip-chars-forward " \t")
-(interactive "*r\nsString rectangle: ")
+(setq whitespace (- (current-column) ocol)))
-(apply-on-rectangle 'string-rectangle-line start end string t))
+;; Delete the following whitespace.
+(delete-region startpos (point))
+;; Insert the desired string.
-(defun clear-rectangle-line (startcol endcol fill)
+(insert string)
-(let ((pt (point-at-eol))
+;; Insert the same width of whitespace that we had before.
-	spaces)
+(indent-to (+ (current-column) whitespace))))
-(when (= (move-to-column startcol (or fill 'coerce)) startcol)
-(if (and (not fill)
+;;;###autoload
-	       (<= (save-excursion (goto-char pt) (current-column)) endcol))
+(defun clear-rectangle (start end)
-	  (delete-region (point) pt)
+"Blank out rectangle with corners at point and mark.
-	;; else
+The text previously in the region is overwritten by the blanks.
-	(setq pt (point))
+When called from a program, requires two args which specify the corners."
-	(move-to-column endcol t)
+(interactive "r")
-	(setq spaces (- (point) pt))
+(operate-on-rectangle 'clear-rectangle-line start end t))
-	(delete-region pt (point))
-	(indent-to (+ (current-column) spaces))))
+(defun clear-rectangle-line (startpos begextra endextra)
-))
+;; Find end of whitespace after the rectangle.
+(skip-chars-forward " \t")
-;;;###autoload
+(let ((column (+ (current-column) endextra)))
-(defun clear-rectangle (start end &optional fill)
+;; Delete the text in the rectangle, and following whitespace.
-"Blank out the region-rectangle.
+(delete-region (point)
-The text previously in the region is overwritten with blanks.
+(progn (goto-char startpos)
+			  (skip-chars-backward " \t")
-When called from a program, the rectangle's corners are START and END.
+			  (point)))
-With a prefix (or FILL) argument, also fill with blanks the parts of the
+;; Reindent out to same column that we were at.
-rectangle which were empty."
+(indent-to column)))
-(interactive "*r\nP")
-(apply-on-rectangle 'clear-rectangle-line start end fill))
 (provide 'rect)
 ;;; rect.el ends here

Mercurial > hg > xemacs-beta

comparison lisp/rect.el @ 412:697ef44129c6 r21-2-14