[Emacs-diffs] /srv/bzr/emacs/trunk r104049: lisp/calc/calccomp.el (math-comp-to-string-flat-term): Simplify.

[Juanma Barranquero]

------------------------------------------------------------
revno: 104049
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Fri 2011-04-29 01:08:37 +0200
message:
  lisp/calc/calccomp.el (math-comp-to-string-flat-term): Simplify.
modified:
  lisp/ChangeLog
  lisp/calc/calccomp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-04-28 22:58:40 +0000
+++ b/lisp/ChangeLog    2011-04-28 23:08:37 +0000
@@ -1,5 +1,8 @@
 2011-04-28  Juanma Barranquero  <address@hidden>
 
+       * calc/calccomp.el (math-comp-to-string-flat-term): Simplify by
+       removing code that has been dead since 1991 or so.
+
        * startup.el (command-line): When warning about "_emacs", use a
        delayed warning to allow the user to filter it out.
 

=== modified file 'lisp/calc/calccomp.el'
--- a/lisp/calc/calccomp.el     2011-01-25 04:08:28 +0000
+++ b/lisp/calc/calccomp.el     2011-04-28 23:08:37 +0000
@@ -1282,12 +1282,7 @@
                 (let ((prefix "") mrg wid)
                   (setq mrg (aref math-comp-buf-margin i))
                   (if (> mrg 12)  ; indenting too far, go back to far left
-                      (let ((j i) (new (if calc-line-numbering 5 1)))
-                        '(while (<= j math-comp-level)
-                          (aset math-comp-buf-margin j
-                                (+ (aref math-comp-buf-margin j) (- new mrg)))
-                          (setq j (1+ j)))
-                        (setq mrg new)))
+                      (setq mrg (if calc-line-numbering 5 1)))
                   (setq wid (+ (length str) math-comp-margin))
                   (and (> (length str) 0) (= (aref str 0) ? )
                        (> (length math-comp-buf) 0)