Merge from emacs-23

[gnu-emacs] / lisp / calc / calc-bin.el

diff --git a/lisp/calc/calc-bin.el b/lisp/calc/calc-bin.el
index dcf0245d93e80097162a0cebe5dc99713cf2d572..3cd5b7af30c68fcd48ca9ba703271e868501760a 100644 (file)
--- 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))
@@ -845,6 +845,8 @@ the size of a Calc bignum digit.")
            (len (length num)))
       (if (< len digs)
           (setq num (concat (make-string (- digs len) ?0) num))))
+    (when calc-group-digits
+      (setq num (math-group-float num)))
     (concat 
      (number-to-string calc-number-radix)
      "##"