aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Belanger2009-11-20 00:57:32 +0000
committerJay Belanger2009-11-20 00:57:32 +0000
commit9e6a33ac875d545a0f42989c0dd359a33f13ef67 (patch)
treec9b0ed15593d4cc53b9392db9787e70845790f0a
parented80ebb62322e1643abb97edd3345ed9f5f36f35 (diff)
downloademacs-9e6a33ac875d545a0f42989c0dd359a33f13ef67.tar.gz
emacs-9e6a33ac875d545a0f42989c0dd359a33f13ef67.zip
(calc-init-extentions): Rename `calc-complement-signed-mode' to
`calc-twos-complement-mode'. (math-format-number-fancy): Let `calc-twos-complement-mode' be nil.
-rw-r--r--lisp/calc/calc-ext.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index f049861764e..7aba947128e 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -987,7 +987,7 @@ calc-find-root calc-poly-interp)
987calc-floor calc-idiv calc-increment calc-mant-part calc-max calc-min 987calc-floor calc-idiv calc-increment calc-mant-part calc-max calc-min
988calc-round calc-scale-float calc-sign calc-trunc calc-xpon-part) 988calc-round calc-scale-float calc-sign calc-trunc calc-xpon-part)
989 989
990 ("calc-bin" calc-and calc-binary-radix calc-clip calc-complement-signed-mode 990 ("calc-bin" calc-and calc-binary-radix calc-clip calc-twos-complement-mode
991calc-decimal-radix calc-diff calc-hex-radix calc-leading-zeros 991calc-decimal-radix calc-diff calc-hex-radix calc-leading-zeros
992calc-lshift-arith calc-lshift-binary calc-not calc-octal-radix calc-or calc-radix 992calc-lshift-arith calc-lshift-binary calc-not calc-octal-radix calc-or calc-radix
993calc-rotate-binary calc-rshift-arith calc-rshift-binary calc-word-size 993calc-rotate-binary calc-rshift-arith calc-rshift-binary calc-word-size
@@ -2998,7 +2998,7 @@ If X is not an error form, return 1."
2998 (math-read-radix (math-match-substring s 3) 2998 (math-read-radix (math-match-substring s 3)
2999 (string-to-number (math-match-substring s 1)))) 2999 (string-to-number (math-match-substring s 1))))
3000 3000
3001 ;; Complement signed with explicit radix 3001 ;; Two's complement with explicit radix
3002 ((string-match "^\\([0-9]+\\)\\(##\\)\\([0-9a-zA-Z]+\\)$" s) 3002 ((string-match "^\\([0-9]+\\)\\(##\\)\\([0-9a-zA-Z]+\\)$" s)
3003 (let ((num (math-read-radix (math-match-substring s 3) 3003 (let ((num (math-read-radix (math-match-substring s 3)
3004 (string-to-number (math-match-substring s 1))))) 3004 (string-to-number (math-match-substring s 1)))))
@@ -3354,6 +3354,7 @@ If X is not an error form, return 1."
3354 (if (math-negp a) 3354 (if (math-negp a)
3355 (concat "-" (math-format-number (math-neg a))) 3355 (concat "-" (math-format-number (math-neg a)))
3356 (let ((calc-number-radix 10) 3356 (let ((calc-number-radix 10)
3357 (calc-twos-complement-mode nil)
3357 (calc-leading-zeros nil) 3358 (calc-leading-zeros nil)
3358 (calc-group-digits nil)) 3359 (calc-group-digits nil))
3359 (format calc-hms-format 3360 (format calc-hms-format