aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2005-11-14 20:21:40 +0000
committerJay Belanger2005-11-14 20:21:40 +0000
commitd0158f73540f5f6de1861fb653cbb87832cb7ce3 (patch)
tree9d31e66764a81159492278ef20c34e882c7f88a2
parent431bbd673eb03d4f96e540e99edd799fb2b99cfa (diff)
downloademacs-d0158f73540f5f6de1861fb653cbb87832cb7ce3.tar.gz
emacs-d0158f73540f5f6de1861fb653cbb87832cb7ce3.zip
(calcFunc-ldiv): Check to see if the first argument is a scalar.
-rw-r--r--lisp/ChangeLog17
-rw-r--r--lisp/calc/calc-arith.el5
2 files changed, 20 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8084a793269..674a8ec5568 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
12005-11-14 Jay Belanger <belanger@truman.edu>
2
3 * calc-alg.el (calcFunc-write-out-power): Rename it to
4 calcFunc-powerexpand.
5 (math-write-out-power): Rename it to math-powerexpand; have it
6 handle negative exponents.
7 (calc-writeoutpower): Rename it to calc-powerexpand.
8
9 * calc-ext.el: Change calcFunc-writeoutpower and
10 calc-writeoutpower to calcFunc-powerexpand and calc-powerexpand in
11 autoloads.
12 Add calcFunc-ldiv to autoloads.
13
14 * calc-arith.el (calcFunc-ldiv): New function.
15
16 * calc.el (calc-left-divide): New function.
17
12005-11-14 Juri Linkov <juri@jurta.org> 182005-11-14 Juri Linkov <juri@jurta.org>
2 19
3 * cus-edit.el (custom-variable-prompt): Set the default value arg 20 * cus-edit.el (custom-variable-prompt): Set the default value arg
diff --git a/lisp/calc/calc-arith.el b/lisp/calc/calc-arith.el
index 4d76e1eab5b..dc341cb7aec 100644
--- a/lisp/calc/calc-arith.el
+++ b/lisp/calc/calc-arith.el
@@ -1856,8 +1856,9 @@
1856 1856
1857;;; Division from the left. 1857;;; Division from the left.
1858(defun calcFunc-ldiv (a b) 1858(defun calcFunc-ldiv (a b)
1859 (math-mul (math-pow a -1) b)) 1859 (if (math-known-scalarp a)
1860 1860 (math-div b a)
1861 (math-mul (math-pow a -1) b)))
1861 1862
1862(defun calcFunc-mod (a b) 1863(defun calcFunc-mod (a b)
1863 (math-normalize (list '% a b))) 1864 (math-normalize (list '% a b)))