lisp/calc/calccomp.el (math-comp-to-string-flat-term): Simplify.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 58bff4e6204731a1174867c0e527a255558fa064..48e4530461f68f27ab620494fefa30cf457b1813 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-28  Juanma Barranquero  <lekktu@gmail.com>
 
+       * 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.
 

diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el
index fa910ce2568fcbcd6d9c790f01b7ca92a74c5f81..906517ac5031c6176a0c902adb01124bc9914634 100644 (file)
--- a/lisp/calc/calccomp.el
+++ b/lisp/calc/calccomp.el
@@ -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)