3 files changed, 18 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ad751b0475..c2d25f1ca30 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-20  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc/calc.el (math-standard-ops): Fix precedence of
+        multiplication.
+
 2007-06-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * vc.el (vc-default-log-view-mode): New function.
diff --git a/man/ChangeLog b/man/ChangeLog
index 8de0d9807f2..1c6d1dbf16b 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-20  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc.texi (Basic Arithmetic, Customizing Calc):
+        Make description of the variable `calc-multiplication-has-precedence'
+        match its new effect.
+
 2007-06-19  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc.texi (Basic Arithmetic, Customizing Calc): Mention
diff --git a/man/calc.texi b/man/calc.texi
index 01c153a230a..3151d9b7b92 100644
--- a/man/calc.texi
+++ b/man/calc.texi
@@ -15987,8 +15987,8 @@ multiplication. (This is not standard across all computer languages, and
 Calc may change the precedence depending on the language mode being used.  
 @xref{Language Modes}.)  This default ordering can be changed by setting
 the customizable variable @code{calc-multiplication-has-precedence} to
-@code{nil} (@pxref{Customizing Calc}); this will give division a higher
-precedence than multiplication.  Note that Calc's default choice of
+@code{nil} (@pxref{Customizing Calc}); this will give multiplication and
+division equal precedences.  Note that Calc's default choice of
 precedence allows @samp{a b / c d} to be used as a shortcut for
 @smallexample
 @group
@@ -35178,14 +35178,14 @@ and @code{calc-embedded-open-close-plain-alist}.
 
 @defvar calc-multiplication-has-precedence
 The variable @code{calc-multiplication-has-precedence} determines
-whether multiplication or division has precedence in algebraic formulas
+whether multiplication has precedence over division in algebraic formulas
 in normal language modes.  If @code{calc-multiplication-has-precedence}
 is non-@code{nil}, then multiplication has precedence, and so for
 example @samp{a/b*c} will be interpreted as @samp{a/(b*c)}. If
-@code{calc-multiplication-has-precedence} is @code{nil}, then division
-has precedence, and so for example @samp{a/b*c} will be interpreted as
-@samp{(a/b)*c}.  The default value of
-@code{calc-multiplication-has-precedence} is @code{t}.
+@code{calc-multiplication-has-precedence} is @code{nil}, then
+multiplication has the same precedence as division, and so for example
+@samp{a/b*c} will be interpreted as @samp{(a/b)*c}.  The default value
+of @code{calc-multiplication-has-precedence} is @code{t}.
 @end defvar
 
 @node Reporting Bugs, Summary, Customizing Calc, Top