diff options
| author | Juanma Barranquero | 2011-04-29 01:08:37 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2011-04-29 01:08:37 +0200 |
| commit | 6e087a44c58220e2c72b55c52bc01b2f8ded2c82 (patch) | |
| tree | 35385d67c57d93ebd77f97b1c5c1d4d2a96e35d1 | |
| parent | 50f845101db138cb6541be4bac9d0b31b39db033 (diff) | |
| download | emacs-6e087a44c58220e2c72b55c52bc01b2f8ded2c82.tar.gz emacs-6e087a44c58220e2c72b55c52bc01b2f8ded2c82.zip | |
lisp/calc/calccomp.el (math-comp-to-string-flat-term): Simplify.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/calc/calccomp.el | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 58bff4e6204..48e4530461f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2011-04-28 Juanma Barranquero <lekktu@gmail.com> | 1 | 2011-04-28 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 2 | ||
| 3 | * calc/calccomp.el (math-comp-to-string-flat-term): Simplify by | ||
| 4 | removing code that has been dead since 1991 or so. | ||
| 5 | |||
| 3 | * startup.el (command-line): When warning about "_emacs", use a | 6 | * startup.el (command-line): When warning about "_emacs", use a |
| 4 | delayed warning to allow the user to filter it out. | 7 | delayed warning to allow the user to filter it out. |
| 5 | 8 | ||
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 @@ | |||
| 1282 | (let ((prefix "") mrg wid) | 1282 | (let ((prefix "") mrg wid) |
| 1283 | (setq mrg (aref math-comp-buf-margin i)) | 1283 | (setq mrg (aref math-comp-buf-margin i)) |
| 1284 | (if (> mrg 12) ; indenting too far, go back to far left | 1284 | (if (> mrg 12) ; indenting too far, go back to far left |
| 1285 | (let ((j i) (new (if calc-line-numbering 5 1))) | 1285 | (setq mrg (if calc-line-numbering 5 1))) |
| 1286 | '(while (<= j math-comp-level) | ||
| 1287 | (aset math-comp-buf-margin j | ||
| 1288 | (+ (aref math-comp-buf-margin j) (- new mrg))) | ||
| 1289 | (setq j (1+ j))) | ||
| 1290 | (setq mrg new))) | ||
| 1291 | (setq wid (+ (length str) math-comp-margin)) | 1286 | (setq wid (+ (length str) math-comp-margin)) |
| 1292 | (and (> (length str) 0) (= (aref str 0) ? ) | 1287 | (and (> (length str) 0) (= (aref str 0) ? ) |
| 1293 | (> (length math-comp-buf) 0) | 1288 | (> (length math-comp-buf) 0) |