[Emacs-diffs] /srv/bzr/emacs/trunk r111969: * doc/misc/calc.texi (Basic Operations on Units): Fix

[Jay Belanger]

------------------------------------------------------------
revno: 111969
committer: Jay Belanger <address@hidden>
branch nick: trunk
timestamp: Thu 2013-03-07 20:11:25 -0600
message:
  * 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.
modified:
  doc/misc/ChangeLog
  doc/misc/calc.texi
  lisp/ChangeLog
  lisp/calc/calc-units.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-03-07 10:24:23 +0000
+++ b/doc/misc/ChangeLog        2013-03-08 02:11:25 +0000
@@ -1,3 +1,8 @@
+2013-03-08  Jay Belanger  <address@hidden>
+
+       * calc.texi (Basic Operations on Units): Fix
+       cross-reference.
+
 2013-03-07  Katsumi Yamaoka  <address@hidden>
 
        * gnus-faq.texi (FAQ 3-11): Now Gnus supports POP3 UIDL.

=== modified file 'doc/misc/calc.texi'
--- a/doc/misc/calc.texi        2013-02-13 04:31:09 +0000
+++ b/doc/misc/calc.texi        2013-03-08 02:11:25 +0000
@@ -27918,8 +27918,8 @@
 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
address@hidden to @code{nil}. 
address@hidden Calc})  Assuming the old and new units you give are
address@hidden to @code{nil};
address@hidden Calc}.)  Assuming the old and new units you give are
 consistent with each other, the result also will not contain any
 units.  For example, @address@hidden c} cm @key{RET} in @key{RET}} converts
 the number 2 on the stack to 5.08.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-03-07 22:35:47 +0000
+++ b/lisp/ChangeLog    2013-03-08 02:11:25 +0000
@@ -1,3 +1,8 @@
+2013-03-08  Jay Belanger  <address@hidden>
+
+       * calc/calc-units.el (calc-convert-units): Fix the way that default
+       new units are stored.
+
 2013-03-07  Karl Fogel  <address@hidden>
 
        * bookmark.el: Define a face to highlight bookmark names in

=== modified file 'lisp/calc/calc-units.el'
--- a/lisp/calc/calc-units.el   2013-02-09 23:17:05 +0000
+++ b/lisp/calc/calc-units.el   2013-03-08 02:11:25 +0000
@@ -503,11 +503,13 @@
            (comp (eq (car-safe units) '+)))
        (unless (or unew std)
          (error "No units specified"))
-       (let ((res
-              (if std
-                  (math-simplify-units (math-to-standard-units expr (nth 1 
std)))
-                (math-convert-units expr units (and uoldname (not (equal 
uoldname "1")))))))
-         (math-put-default-units res (if comp units))
+       (let* ((noold (and uoldname (not (equal uoldname "1"))))
+              (res
+               (if std
+                   (math-simplify-units (math-to-standard-units expr (nth 1 
std)))
+                 (math-convert-units expr units noold))))
+         (unless std
+           (math-put-default-units (if noold units res) (if comp units)))
          (calc-enter-result 1 "cvun" res))))))
 
 (defun calc-autorange-units (arg)