calc-bin.el (calc-radix): Have the O option turn on twos-complement mode.

3 files changed, 14 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2edd1522658..d47d9bae82a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-18  Jay Belanger  <jay.p.belanger@gmail.com>
+
+	* calc.el (calc-mode-map): Bind "O" to `calc-missing-key'.
+
+	* calc-bin.el (calc-radix): Have the "O" option turn on
+	twos-complement mode.
+
 2010-04-17  Jay Belanger  <jay.p.belanger@gmail.com>
 
 	* calc-ext.el (calc-init-extensions): Add keybinding for 'calc-option'.
diff --git a/lisp/calc/README b/lisp/calc/README
index 9e095252fc1..3e3acaebb27 100644
--- a/lisp/calc/README
+++ b/lisp/calc/README
@@ -72,6 +72,12 @@ opinions.
 Summary of changes to "Calc"
 ------- -- ------- --  ----
 
+Emacs 24.1
+
+* Added "O" option prefix.
+
+* Used "O" prefix to "d r" (`calc-radix') to turn on twos-complement mode.
+
 Emacs 23.2
 
 * Added twos-complement display.
diff --git a/lisp/calc/calc-bin.el b/lisp/calc/calc-bin.el
index 7af60e92140..0e31fbe681c 100644
--- a/lisp/calc/calc-bin.el
+++ b/lisp/calc/calc-bin.el
@@ -175,7 +175,7 @@ the size of a Calc bignum digit.")
        (progn
 	 (calc-change-mode 
           (list 'calc-number-radix 'calc-twos-complement-mode)
-          (list n (and (or (= n 2) (= n 8) (= n 16)) arg)) t)
+          (list n (or arg (calc-is-option))) t)
 	 ;; also change global value so minibuffer sees it
 	 (setq-default calc-number-radix calc-number-radix))
      (setq n calc-number-radix))