From: Jay Belanger Date: Fri, 17 Dec 2004 05:26:18 +0000 (+0000) Subject: (math-random-last): Declare it. X-Git-Tag: ttn-vms-21-2-B4~3228 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a59a16878f6b78c4966d621cd792a16a0dbfe758;p=emacs.git (math-random-last): Declare it. (math-random-digit): Undo last change. Don't make math-random-last local. (var-RandSeed): Don't initially bind it. (math-init-random-base, math-random-digit): Check to see if var-RandSeed is bound. --- diff --git a/lisp/calc/calc-comb.el b/lisp/calc/calc-comb.el index 262db6c9bda..adb8fcecce6 100644 --- a/lisp/calc/calc-comb.el +++ b/lisp/calc/calc-comb.el @@ -540,12 +540,12 @@ ;;; Produce a random 10-bit integer, with (random) if no seed provided, ;;; or else with Numerical Recipes algorithm ran3 / Knuth 3.2.2-A. -(defvar var-RandSeed nil) +(defvar var-RandSeed) (defvar math-random-cache nil) (defvar math-gaussian-cache nil) (defun math-init-random-base () - (if var-RandSeed + (if (and (boundp 'var-RandSeed) var-RandSeed) (if (eq (car-safe var-RandSeed) 'vec) nil (if (Math-integerp var-RandSeed) @@ -599,9 +599,10 @@ ;;; Produce a random digit in the range 0..999. ;;; Avoid various pitfalls that may lurk in the built-in (random) function! ;;; Shuffling algorithm from Numerical Recipes, section 7.1. +(defvar math-random-last) (defun math-random-digit () - (let (i math-random-last) - (or (and var-RandSeed (eq var-RandSeed math-last-RandSeed)) + (let (i) + (or (and (boundp 'var-RandSeed) (eq var-RandSeed math-last-RandSeed)) (math-init-random-base)) (or math-random-cache (progn