[Emacs-diffs] Changes to emacs/lisp/calc/calc-incom.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/calc/calc-incom.el
diff -c emacs/lisp/calc/calc-incom.el:1.5.4.2 
emacs/lisp/calc/calc-incom.el:1.5.4.3
*** emacs/lisp/calc/calc-incom.el:1.5.4.2       Wed Oct 27 05:42:03 2004
--- emacs/lisp/calc/calc-incom.el       Wed Dec  8 05:02:18 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-incom () nil)
- 
- 
  ;;; Incomplete forms.
  
  (defun calc-begin-complex ()
--- 27,36 ----
  ;;; Code:
  
  ;; This file is autoloaded from calc-ext.el.
  
+ (require 'calc-ext)
  (require 'calc-macs)
  
  ;;; Incomplete forms.
  
  (defun calc-begin-complex ()
***************
*** 172,177 ****
--- 168,179 ----
                                   (cons 'vec (append (cdr (cdr inc)) stuff)))
                             (list 'incomplete 'vec))))))))
  
+ ;; The following variables are initially declared in calc.el,
+ ;; but are used by calc-digit-dots.
+ (defvar calc-prev-char)
+ (defvar calc-prev-prev-char)
+ (defvar calc-digit-value)
+ 
  (defun calc-digit-dots ()
    (if (eq calc-prev-char ?.)
        (progn
***************
*** 227,231 ****
--- 229,235 ----
         (error "Interval form is incomplete"))
        (t (error "Object is incomplete"))))
  
+ (provide 'calc-incom)
+ 
  ;;; arch-tag: b8001270-4dc7-481b-a3e3-a952e19b390d
  ;;; calc-incom.el ends here