summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJay Belanger <jay.p.belanger@gmail.com>2013-03-07 20:11:25 -0600
committerJay Belanger <jay.p.belanger@gmail.com>2013-03-07 20:11:25 -0600
commit6d7ebb726dd39b5e5e9f12e0341a4bb350caf637 (patch)
treeddf2c9be5cf92e827f04016ee61c926fbe7588d3 /doc
parent36075a19b2d37e38e8258dff2f774a2a3702dc55 (diff)
downloademacs-6d7ebb726dd39b5e5e9f12e0341a4bb350caf637.tar.gz
* doc/misc/calc.texi (Basic Operations on Units): Fix
cross-reference. * calc/calc-units.el (calc-convert-units): Fix the way that default new units are stored.
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/calc.texi4
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 12230bfb374..b634cf7433a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2013-03-08 Jay Belanger <jay.p.belanger@gmail.com>
+
+ * calc.texi (Basic Operations on Units): Fix
+ cross-reference.
+
2013-03-07 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-faq.texi (FAQ 3-11): Now Gnus supports POP3 UIDL.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index 2d1f59cfa68..0bf7833ec34 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -27918,8 +27918,8 @@ simplified so that it doesn't contain any units, like @samp{ft/in} can
be simplified to 12, then @kbd{u c} will still prompt for both old
units and new units. You can ignore the prompt for old units with
@key{RET}, or turn off the prompt by setting the customizable variable
-@code{calc-allow-units-as-numbers} to @code{nil}.
-@pxref{Customizing Calc}) Assuming the old and new units you give are
+@code{calc-allow-units-as-numbers} to @code{nil};
+@pxref{Customizing Calc}.) Assuming the old and new units you give are
consistent with each other, the result also will not contain any
units. For example, @kbd{@w{u c} cm @key{RET} in @key{RET}} converts
the number 2 on the stack to 5.08.