aboutsummaryrefslogtreecommitdiffstats
path: root/doc/misc
diff options
context:
space:
mode:
authorJay Belanger2013-03-07 20:11:25 -0600
committerJay Belanger2013-03-07 20:11:25 -0600
commit6d7ebb726dd39b5e5e9f12e0341a4bb350caf637 (patch)
treeddf2c9be5cf92e827f04016ee61c926fbe7588d3 /doc/misc
parent36075a19b2d37e38e8258dff2f774a2a3702dc55 (diff)
downloademacs-6d7ebb726dd39b5e5e9f12e0341a4bb350caf637.tar.gz
emacs-6d7ebb726dd39b5e5e9f12e0341a4bb350caf637.zip
* 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/misc')
-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 @@
12013-03-08 Jay Belanger <jay.p.belanger@gmail.com>
2
3 * calc.texi (Basic Operations on Units): Fix
4 cross-reference.
5
12013-03-07 Katsumi Yamaoka <yamaoka@jpl.org> 62013-03-07 Katsumi Yamaoka <yamaoka@jpl.org>
2 7
3 * gnus-faq.texi (FAQ 3-11): Now Gnus supports POP3 UIDL. 8 * 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
27918be simplified to 12, then @kbd{u c} will still prompt for both old 27918be simplified to 12, then @kbd{u c} will still prompt for both old
27919units and new units. You can ignore the prompt for old units with 27919units and new units. You can ignore the prompt for old units with
27920@key{RET}, or turn off the prompt by setting the customizable variable 27920@key{RET}, or turn off the prompt by setting the customizable variable
27921@code{calc-allow-units-as-numbers} to @code{nil}. 27921@code{calc-allow-units-as-numbers} to @code{nil};
27922@pxref{Customizing Calc}) Assuming the old and new units you give are 27922@pxref{Customizing Calc}.) Assuming the old and new units you give are
27923consistent with each other, the result also will not contain any 27923consistent with each other, the result also will not contain any
27924units. For example, @kbd{@w{u c} cm @key{RET} in @key{RET}} converts 27924units. For example, @kbd{@w{u c} cm @key{RET} in @key{RET}} converts
27925the number 2 on the stack to 5.08. 27925the number 2 on the stack to 5.08.