(Fread_file_name): Correct handling of dollars in file

[bpt/emacs.git] / lisp / rect.el

diff --git a/lisp/rect.el b/lisp/rect.el
index 895c3ae..3a643c6 100644 (file)
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -29,6 +29,21 @@
 
 ;;; 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)
@@ -60,10 +75,14 @@ Point is at the end of the segment of this line within the rectangle."
      (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))
@@ -176,7 +195,7 @@ and point is at the lower right corner."
          (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)))))
@@ -197,6 +216,8 @@ but instead winds up to the right of the rectangle."
     (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)))
@@ -205,8 +226,9 @@ but instead winds up to the right of the rectangle."
     ;; 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 close-rectangle (start end)
+(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
@@ -227,9 +249,8 @@ rectangle, all continuous whitespace starting at that column is deleted."
 
 ;;;###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: ")
@@ -238,7 +259,8 @@ Called from a program, takes three args; START, END and STRING."
 
 (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")