From: Juanma Barranquero Date: Thu, 28 Apr 2011 23:08:37 +0000 (+0200) Subject: lisp/calc/calccomp.el (math-comp-to-string-flat-term): Simplify. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~177 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6e087a44c58220e2c72b55c52bc01b2f8ded2c82;p=emacs.git lisp/calc/calccomp.el (math-comp-to-string-flat-term): Simplify. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 58bff4e6204..48e4530461f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2011-04-28 Juanma Barranquero + * 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 fa910ce2568..906517ac503 100644 --- 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)