[Emacs-diffs] Changes to emacs/lisp/rect.el

[Richard M . Stallman]

Index: emacs/lisp/rect.el
diff -c emacs/lisp/rect.el:1.46 emacs/lisp/rect.el:1.47
*** emacs/lisp/rect.el:1.46     Mon Sep  1 15:45:14 2003
--- emacs/lisp/rect.el  Sat Jan 29 17:26:39 2005
***************
*** 127,140 ****
      ))
  
  (defun delete-rectangle-line (startcol endcol fill)
!   (when (= (move-to-column startcol (or fill 'coerce)) startcol)
      (delete-region (point)
                   (progn (move-to-column endcol 'coerce)
                          (point)))))
  
  (defun delete-extract-rectangle-line (startcol endcol lines fill)
    (let ((pt (point-at-eol)))
!     (if (< (move-to-column startcol (or fill 'coerce)) startcol)
        (setcdr lines (cons (spaces-string (- endcol startcol))
                            (cdr lines)))
        ;; else
--- 127,140 ----
      ))
  
  (defun delete-rectangle-line (startcol endcol fill)
!   (when (= (move-to-column startcol (if fill t 'coerce)) startcol)
      (delete-region (point)
                   (progn (move-to-column endcol 'coerce)
                          (point)))))
  
  (defun delete-extract-rectangle-line (startcol endcol lines fill)
    (let ((pt (point-at-eol)))
!     (if (< (move-to-column startcol (if fill t 'coerce)) startcol)
        (setcdr lines (cons (spaces-string (- endcol startcol))
                            (cdr lines)))
        ;; else
***************
*** 284,296 ****
    (goto-char start))
  
  (defun open-rectangle-line (startcol endcol fill)
!   (when (= (move-to-column startcol (or fill 'coerce)) startcol)
      (unless (and (not fill)
                 (= (point) (point-at-eol)))
        (indent-to endcol))))
  
  (defun delete-whitespace-rectangle-line (startcol endcol fill)
!   (when (= (move-to-column startcol (or fill 'coerce)) startcol)
      (unless (= (point) (point-at-eol))
        (delete-region (point) (progn (skip-syntax-forward " ") (point))))))
  
--- 284,296 ----
    (goto-char start))
  
  (defun open-rectangle-line (startcol endcol fill)
!   (when (= (move-to-column startcol (if fill t 'coerce)) startcol)
      (unless (and (not fill)
                 (= (point) (point-at-eol)))
        (indent-to endcol))))
  
  (defun delete-whitespace-rectangle-line (startcol endcol fill)
!   (when (= (move-to-column startcol (if fill t 'coerce)) startcol)
      (unless (= (point) (point-at-eol))
        (delete-region (point) (progn (skip-syntax-forward " ") (point))))))
  
***************
*** 371,377 ****
  
  (defun clear-rectangle-line (startcol endcol fill)
    (let ((pt (point-at-eol)))
!     (when (= (move-to-column startcol (or fill 'coerce)) startcol)
        (if (and (not fill)
               (<= (save-excursion (goto-char pt) (current-column)) endcol))
          (delete-region (point) pt)
--- 371,377 ----
  
  (defun clear-rectangle-line (startcol endcol fill)
    (let ((pt (point-at-eol)))
!     (when (= (move-to-column startcol (if fill t 'coerce)) startcol)
        (if (and (not fill)
               (<= (save-excursion (goto-char pt) (current-column)) endcol))
          (delete-region (point) pt)