[Emacs-diffs] Changes to emacs/lisp/calc/calc-bin.el [lexbind]

[Miles Bader]

Index: emacs/lisp/calc/calc-bin.el
diff -c emacs/lisp/calc/calc-bin.el:1.5.2.2 emacs/lisp/calc/calc-bin.el:1.5.2.3
*** emacs/lisp/calc/calc-bin.el:1.5.2.2 Tue Oct 14 23:35:48 2003
--- emacs/lisp/calc/calc-bin.el Wed Dec  8 23:36:21 2004
***************
*** 3,10 ****
  ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
  
  ;; Author: David Gillespie <address@hidden>
! ;; Maintainers: D. Goel <address@hidden>
! ;;              Colin Walters <address@hidden>
  
  ;; This file is part of GNU Emacs.
  
--- 3,9 ----
  ;; Copyright (C) 1990, 1991, 1992, 1993, 2001 Free Software Foundation, Inc.
  
  ;; Author: David Gillespie <address@hidden>
! ;; Maintainer: Jay Belanger <address@hidden>
  
  ;; This file is part of GNU Emacs.
  
***************
*** 28,40 ****
  ;;; Code:
  
  ;; This file is autoloaded from calc-ext.el.
- (require 'calc-ext)
  
  (require 'calc-macs)
  
- (defun calc-Need-calc-bin () nil)
- 
- 
  ;;; b-prefix binary commands.
  
  (defun calc-and (n)
--- 27,36 ----
  ;;; Code:
  
  ;; This file is autoloaded from calc-ext.el.
  
+ (require 'calc-ext)
  (require 'calc-macs)
  
  ;;; b-prefix binary commands.
  
  (defun calc-and (n)
***************
*** 656,662 ****
    (let ((fmt (car calc-float-format))
        (figs (nth 1 calc-float-format))
        (point calc-point-char)
!       (str nil))
      (if (eq fmt 'fix)
        (let* ((afigs (math-abs figs))
               (fp (math-float-parts a (> afigs 0)))
--- 652,659 ----
    (let ((fmt (car calc-float-format))
        (figs (nth 1 calc-float-format))
        (point calc-point-char)
!       (str nil)
!         pos)
      (if (eq fmt 'fix)
        (let* ((afigs (math-abs figs))
               (fp (math-float-parts a (> afigs 0)))
***************
*** 751,758 ****
          (if explo
              (let ((estr (let ((calc-number-radix 10)
                                (calc-group-digits nil))
!                           (setq estr (math-format-number
!                                       (math-sub explo eadj))))))
                (setq str (if (or (memq calc-language '(math maple))
                                  (> calc-number-radix 14))
                              (format "%s*%d.^%s" str calc-number-radix estr)
--- 748,755 ----
          (if explo
              (let ((estr (let ((calc-number-radix 10)
                                (calc-group-digits nil))
!                             (math-format-number
!                              (math-sub explo eadj)))))
                (setq str (if (or (memq calc-language '(math maple))
                                  (> calc-number-radix 14))
                              (format "%s*%d.^%s" str calc-number-radix estr)
***************
*** 774,779 ****
--- 771,777 ----
                                math-radix-digits-cache))))))))
  
  (defvar math-radix-float-cache-tag nil)
+ (defvar math-radix-float-cache)
  
  (defun math-radix-float-power (n)
    (if (eq n 0)
***************
*** 803,808 ****
--- 801,807 ----
                                                       calc-number-radix))))))
                               math-radix-float-cache))))))))
  
+ (provide 'calc-bin)
  
  ;;; arch-tag: f6dba7bc-53b2-41ae-919c-c266ab0ca8b3
  ;;; calc-bin.el ends here