[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/calc/calc-stuff.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/calc/calc-stuff.el [lexbind] |
Date: |
Wed, 08 Dec 2004 19:35:22 -0500 |
Index: emacs/lisp/calc/calc-stuff.el
diff -c emacs/lisp/calc/calc-stuff.el:1.3.4.2
emacs/lisp/calc/calc-stuff.el:1.3.4.3
*** emacs/lisp/calc/calc-stuff.el:1.3.4.2 Tue Oct 14 23:35:49 2003
--- emacs/lisp/calc/calc-stuff.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-stuff () nil)
-
-
(defun calc-num-prefix (n)
"Use the number at the top of stack as the numeric prefix for the next
command.
With a prefix, push that prefix as a number onto the stack."
--- 27,36 ----
;;; Code:
;; This file is autoloaded from calc-ext.el.
+ (require 'calc-ext)
(require 'calc-macs)
(defun calc-num-prefix (n)
"Use the number at the top of stack as the numeric prefix for the next
command.
With a prefix, push that prefix as a number onto the stack."
***************
*** 165,170 ****
--- 161,178 ----
(interactive)
(message "Calc %s" calc-version))
+ ;; The following caches are declared in other files, but are
+ ;; reset here.
+ (defvar math-lud-cache) ; calc-mtx.el
+ (defvar math-log2-cache) ; calc-bin.el
+ (defvar math-radix-digits-cache) ; calc-bin.el
+ (defvar math-radix-float-cache-tag) ; calc-bin.el
+ (defvar math-random-cache) ; calc-comb.el
+ (defvar math-max-digits-cache) ; calc-bin.el
+ (defvar math-integral-cache) ; calcalg2.el
+ (defvar math-units-table) ; calc-units.el
+ (defvar math-format-date-cache) ; calc-forms.el
+ (defvar math-holidays-cache-tag) ; calc-forms.el
(defun calc-flush-caches (&optional inhibit-msg)
(interactive "P")
***************
*** 175,187 ****
math-radix-float-cache-tag nil
math-random-cache nil
math-max-digits-cache nil
- math-checked-rewrites nil
math-integral-cache nil
math-units-table nil
math-decls-cache-tag nil
math-eval-rules-cache-tag t
- math-graph-var-cache nil
- math-graph-data-cache nil
math-format-date-cache nil
math-holidays-cache-tag t)
(mapcar (function (lambda (x) (set x -100))) math-cache-list)
--- 183,192 ----
***************
*** 270,286 ****
(math-map-over-constants (function (lambda (x) (calcFunc-frac x tol)))
a))
! (defun math-map-over-constants (func expr)
(math-map-over-constants-rec expr))
(defun math-map-over-constants-rec (expr)
(cond ((or (Math-primp expr)
(memq (car expr) '(intv sdev)))
(or (and (Math-objectp expr)
! (funcall func expr))
expr))
((and (memq (car expr) '(^ calcFunc-subscr))
! (eq func 'math-float)
(= (length expr) 3)
(Math-integerp (nth 2 expr)))
(list (car expr)
--- 275,296 ----
(math-map-over-constants (function (lambda (x) (calcFunc-frac x tol)))
a))
! ;; The variable math-moc-func is local to math-map-over-constants,
! ;; but is used by math-map-over-constants-rec, which is called by
! ;; math-map-over-constants.
! (defvar math-moc-func)
!
! (defun math-map-over-constants (math-moc-func expr)
(math-map-over-constants-rec expr))
(defun math-map-over-constants-rec (expr)
(cond ((or (Math-primp expr)
(memq (car expr) '(intv sdev)))
(or (and (Math-objectp expr)
! (funcall math-moc-func expr))
expr))
((and (memq (car expr) '(^ calcFunc-subscr))
! (eq math-moc-func 'math-float)
(= (length expr) 3)
(Math-integerp (nth 2 expr)))
(list (car expr)
***************
*** 288,292 ****
--- 298,304 ----
(nth 2 expr)))
(t (cons (car expr) (mapcar 'math-map-over-constants-rec (cdr expr))))))
+ (provide 'calc-stuff)
+
;;; arch-tag: 789332ef-a178-49d3-8fb7-5d7ed7e21f56
;;; calc-stuff.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/calc/calc-stuff.el [lexbind],
Miles Bader <=