[Emacs-diffs] emacs/lisp/calc calc.el

[Jay Belanger]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jay Belanger <jpb>      09/11/20 00:54:19

Modified files:
        lisp/calc      : calc.el 

Log message:
        (calc-set-mode-line): Rename `calc-complement-signed-mode' to
        `calc-twos-complement-mode'.
        (math-format-number): Rename `math-format-complement-signed' to
        `math-format-twos-complement'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/calc/calc.el?cvsroot=emacs&r1=1.138&r2=1.139

Patches:
Index: calc.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/calc/calc.el,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- calc.el     15 Nov 2009 23:58:11 -0000      1.138
+++ calc.el     20 Nov 2009 00:54:19 -0000      1.139
@@ -208,7 +208,7 @@
 (declare-function math-adjust-fraction "calc-ext" (a))
 (declare-function math-format-binary "calc-bin" (a))
 (declare-function math-format-radix "calc-bin" (a))
-(declare-function math-format-complement-signed "calc-bin" (a))
+(declare-function math-format-twos-complement "calc-bin" (a))
 (declare-function math-group-float "calc-ext" (str))
 (declare-function math-mod "calc-misc" (a b))
 (declare-function math-format-number-fancy "calc-ext" (a prec))
@@ -690,8 +690,8 @@
 If `scalar', variables are assumed to be scalar-valued.
 If nil, symbolic math routines make no assumptions about variables.")
 
-(defcalcmodevar calc-complement-signed-mode nil
-  "If non-nil, display integers in complement signed mode.")
+(defcalcmodevar calc-twos-complement-mode nil
+  "If non-nil, display integers in two's complement mode.")
 
 
 (defcalcmodevar calc-shift-prefix nil
@@ -1710,7 +1710,7 @@
                           ((= calc-number-radix 8) "Oct ")
                           ((= calc-number-radix 16) "Hex ")
                           (t (format "Radix%d " calc-number-radix)))
-                     (if calc-complement-signed-mode "CompSign " "")
+                     (if calc-twos-complement-mode "TwosComp " "")
                     (if calc-leading-zeros "Zero " "")
                     (cond ((null calc-language) "")
                            ((get calc-language 'math-lang-name)
@@ -3393,7 +3393,7 @@
 (defun math-format-number (a &optional prec)   ; [X N]   [Public]
   (cond
    ((eq calc-display-raw t) (format "%s" a))
-   ((and calc-complement-signed-mode
+   ((and calc-twos-complement-mode
          math-radix-explicit-format
          (Math-integerp a)
          (or (eq a 0)
@@ -3406,7 +3406,7 @@
                     (or (= comparison 0)
                         (= comparison -1))))))
     (require 'calc-bin)
-    (math-format-complement-signed a))
+    (math-format-twos-complement a))
    ((and (nth 1 calc-frac-format) (Math-integerp a))
     (require 'calc-ext)
     (math-format-number (math-adjust-fraction a)))