diff options
| author | Jay Belanger <jay.p.belanger@gmail.com> | 2011-02-06 18:54:23 -0600 |
|---|---|---|
| committer | Jay Belanger <jay.p.belanger@gmail.com> | 2011-02-06 18:54:23 -0600 |
| commit | ec6ad6f20a885e8a87f31c4fd2c76d470ae61d12 (patch) | |
| tree | 48970eb8bffeaa575546b800766583a3ce553688 /lisp/calc/calc-units.el | |
| parent | c5aff743c3963a8fdaab628d2b695df50432e0de (diff) | |
| download | emacs-ec6ad6f20a885e8a87f31c4fd2c76d470ae61d12.tar.gz emacs-ec6ad6f20a885e8a87f31c4fd2c76d470ae61d12.tar.bz2 emacs-ec6ad6f20a885e8a87f31c4fd2c76d470ae61d12.zip | |
calc/README: Add mention of logarithmic units.
calc/calc-help.el (calc-logunits-add): Rename from `calc-logunits-plus'.
(calc-logunits-sub): Rename from `calc-logunits-minus'.
(calc-logunits-mul): Rename from `calc-logunits-times'.
(calcFunc-lupoweradd): Rename from `calcFunc-lupowerplus'.
(calcFunc-lupowersub): Rename from `calcFunc-lupowerminus'.
(calcFunc-lupowermul): Rename from `calcFunc-lupowertimes'.
calc/calc-ext.el (calc-init-extensions): Change names of logarithmic
unit functions in autoloads.
Diffstat (limited to 'lisp/calc/calc-units.el')
| -rw-r--r-- | lisp/calc/calc-units.el | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el index c6bcff79765..65b3356b13a 100644 --- a/lisp/calc/calc-units.el +++ b/lisp/calc/calc-units.el @@ -1567,7 +1567,7 @@ If EXPR is nil, return nil." (list '^ (math-extract-logunits (nth 1 expr)) (nth 2 expr)) (if (member expr math-logunits) expr 1)))) -(defun math-logunits-plus (a b neg power) +(defun math-logunits-add (a b neg power) (let ((aunit (math-simplify (math-extract-logunits a)))) (if (not (eq (car-safe aunit) 'var)) (calc-record-why "*Improper logarithmic unit" aunit) @@ -1607,18 +1607,18 @@ If EXPR is nil, return nil." units))))))) (defun calcFunc-lufieldplus (a b) - (math-logunits-plus a b nil nil)) + (math-logunits-add a b nil nil)) (defun calcFunc-lupowerplus (a b) - (math-logunits-plus a b nil t)) + (math-logunits-add a b nil t)) (defun calcFunc-lufieldminus (a b) - (math-logunits-plus a b t nil)) + (math-logunits-add a b t nil)) (defun calcFunc-lupowerminus (a b) - (math-logunits-plus a b t t)) + (math-logunits-add a b t t)) -(defun calc-logunits-plus (arg) +(defun calc-logunits-add (arg) (interactive "P") (calc-slow-wrapper (if (calc-is-inverse) @@ -1629,7 +1629,7 @@ If EXPR is nil, return nil." (calc-binary-op "lu+" 'calcFunc-lufieldplus arg) (calc-binary-op "lu+" 'calcFunc-lupowerplus arg))))) -(defun calc-logunits-minus (arg) +(defun calc-logunits-sub (arg) (interactive "P") (calc-slow-wrapper (if (calc-is-inverse) @@ -1640,7 +1640,7 @@ If EXPR is nil, return nil." (calc-binary-op "lu-" 'calcFunc-lufieldminus arg) (calc-binary-op "lu-" 'calcFunc-lupowerminus arg))))) -(defun math-logunits-times (a b power) +(defun math-logunits-mul (a b power) (let (logunit coef units number) (cond ((and @@ -1703,12 +1703,12 @@ If EXPR is nil, return nil." units))))))))) (defun calcFunc-lufieldtimes (a b) - (math-logunits-times a b nil)) + (math-logunits-mul a b nil)) (defun calcFunc-lupowertimes (a b) - (math-logunits-times a b t)) + (math-logunits-mul a b t)) -(defun calc-logunits-times (arg) +(defun calc-logunits-mul (arg) (interactive "P") (calc-slow-wrapper (if (calc-is-inverse) |