[Emacs-diffs] /srv/bzr/emacs/trunk r102666: Delete long unused functions and variables in rect.el.

[Chong Yidong]

------------------------------------------------------------
revno: 102666
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2010-12-15 10:05:38 +0800
message:
  Delete long unused functions and variables in rect.el.
  lisp/rect.el (operate-on-rectangle-lines, string-rectangle-string):
  Delete unused variables.
  (move-to-column-force): Remove function obsolete since 21.2.
modified:
  lisp/ChangeLog
  lisp/eshell/em-rebind.el
  lisp/mail/rmail.el
  lisp/rect.el
  lisp/vc/cvs-status.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-12-14 20:33:33 +0000
+++ b/lisp/ChangeLog    2010-12-15 02:05:38 +0000
@@ -1,3 +1,9 @@
+2010-12-15  Chong Yidong  <address@hidden>
+
+       * rect.el (operate-on-rectangle-lines, string-rectangle-string):
+       Delete unused variables.
+       (move-to-column-force): Remove function obsolete since 21.2.
+
 2010-12-14  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-temp-buffer-file-name): Make it permanent-local.

=== modified file 'lisp/eshell/em-rebind.el'
--- a/lisp/eshell/em-rebind.el  2010-09-25 21:51:55 +0000
+++ b/lisp/eshell/em-rebind.el  2010-12-15 02:05:38 +0000
@@ -91,7 +91,6 @@
   '(beginning-of-line-text
     beginning-of-line
     move-to-column
-    move-to-column-force
     move-to-left-margin
     move-to-tab-stop
     forward-char

=== modified file 'lisp/mail/rmail.el'
--- a/lisp/mail/rmail.el        2010-12-13 15:27:36 +0000
+++ b/lisp/mail/rmail.el        2010-12-15 02:05:38 +0000
@@ -4380,7 +4380,7 @@
 
 ;;;### (autoloads (rmail-summary-by-senders rmail-summary-by-topic
 ;;;;;;  rmail-summary-by-regexp rmail-summary-by-recipients 
rmail-summary-by-labels
-;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" 
"d855683972baef7111d4508dffbb54b6")
+;;;;;;  rmail-summary) "rmailsum" "rmailsum.el" 
"666a5db1021cdcba6e68a18a553d65f1")
 ;;; Generated autoloads from rmailsum.el
 
 (autoload 'rmail-summary "rmailsum" "\

=== modified file 'lisp/rect.el'
--- a/lisp/rect.el      2010-08-29 16:17:13 +0000
+++ b/lisp/rect.el      2010-12-15 02:05:38 +0000
@@ -27,10 +27,8 @@
 ;; This package provides the operations on rectangles that are documented
 ;; in the Emacs manual.
 
-;; ### NOTE: this file has been almost completely rewritten by Didier Verna
-;; <address@hidden> in July 1999. 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.
+;; ### NOTE: this file was almost completely rewritten by Didier Verna
+;; <address@hidden> in July 1999.
 
 ;;; Global key bindings
 
@@ -43,23 +41,7 @@
 
 ;;; Code:
 
-;;;###autoload
-(defun move-to-column-force (column &optional flag)
-  "If COLUMN is within a multi-column character, replace it by spaces and tab.
-As for `move-to-column', passing anything but nil or t in FLAG will move to
-the desired column only if the line is long enough."
-  (move-to-column column (or flag t)))
-
-;;;###autoload
-(make-obsolete 'move-to-column-force 'move-to-column "21.2")
-
-;; not used any more --dv
-;; extract-rectangle-line stores lines into this list
-;; to accumulate them for extract-rectangle and delete-extract-rectangle.
-(defvar operate-on-rectangle-lines)
-
-;; ### NOTE: this function is untouched, but not used anymore apart from
-;; `delete-whitespace-rectangle'. `apply-on-rectangle' is used instead. --dv
+;; FIXME: this function should be replaced by `apply-on-rectangle'
 (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
@@ -107,7 +89,6 @@
        (forward-line 1)))
     (- endcol startcol)))
 
-;; The replacement for `operate-on-rectangle' -- dv
 (defun apply-on-rectangle (function start end &rest args)
   "Call FUNCTION for each line of rectangle with corners at START, END.
 FUNCTION is called with two arguments: the start and end columns of the
@@ -151,9 +132,9 @@
       (setcdr lines (cons (filter-buffer-substring pt (point) t) (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
+;; 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.
 (defun extract-rectangle-line (startcol endcol lines)
   (let (start end begextra endextra line)
     (move-to-column startcol)
@@ -186,7 +167,6 @@
 (defconst spaces-strings
   '["" " " "  " "   " "    " "     " "      " "       " "        "])
 
-;; this one is untouched --dv
 (defun spaces-string (n)
   "Return a string with N spaces."
   (if (<= n 8) (aref spaces-strings n)
@@ -253,14 +233,12 @@
        (barf-if-buffer-read-only)
        (signal 'text-read-only (list (current-buffer)))))))
 
-;; this one is untouched --dv
 ;;;###autoload
 (defun yank-rectangle ()
   "Yank the last killed rectangle with upper left corner at point."
   (interactive "*")
   (insert-rectangle killed-rectangle))
 
-;; this one is untoutched --dv
 ;;;###autoload
 (defun insert-rectangle (rectangle)
   "Insert text of RECTANGLE with upper left corner at point.
@@ -323,10 +301,6 @@
   (interactive "*r\nP")
   (apply-on-rectangle 'delete-whitespace-rectangle-line start end fill))
 
-;; not used any more --dv
-;; string-rectangle uses this variable to pass the string
-;; to string-rectangle-line.
-(defvar string-rectangle-string)
 (defvar string-rectangle-history nil)
 (defun string-rectangle-line (startcol endcol string delete)
   (move-to-column startcol t)

=== modified file 'lisp/vc/cvs-status.el'
--- a/lisp/vc/cvs-status.el     2010-06-11 19:09:57 +0000
+++ b/lisp/vc/cvs-status.el     2010-12-15 02:05:38 +0000
@@ -223,7 +223,6 @@
   (let* ((eol (save-excursion (end-of-line) (current-column)))
         (column (max (+ eol 2) column)))
     (if (null tags) column
-      ;;(move-to-column-force column)
       (let* ((rev (cvs-car tags))
             (name (funcall printer (cvs-car rev)))
             (rest (append (cvs-cdr name) (cvs-cdr tags)))