X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/6a43ef8e8508df7d732e639ec75f657f4363e27a..dcefd2bbc0e404c26f1e5b68c910404355f488fb:/lisp/calc/calc-comb.el

diff --git a/lisp/calc/calc-comb.el b/lisp/calc/calc-comb.el
index 199bbf0ae3..132757aed5 100644
--- a/lisp/calc/calc-comb.el
+++ b/lisp/calc/calc-comb.el
@@ -1,9 +1,8 @@
 ;;; calc-comb.el --- combinatoric functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2012 Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
-;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>
 
 ;; This file is part of GNU Emacs.
 
@@ -77,7 +76,7 @@
      4877 4889 4903 4909 4919 4931 4933 4937 4943 4951 4957 4967 4969 4973
      4987 4993 4999 5003])
 
-;; The variable math-prime-factors-finished is set by calcFunc-prfac to 
+;; The variable math-prime-factors-finished is set by calcFunc-prfac to
 ;; indicate whether factoring is complete, and used by calcFunc-factors,
 ;; calcFunc-totient and calcFunc-moebius.
 (defvar math-prime-factors-finished)
@@ -510,8 +509,8 @@
       (while (<= (length math-stirling-local-cache) n)
 	(let ((i (1- (length math-stirling-local-cache)))
 	      row)
-	  (setq math-stirling-local-cache 
-                (vconcat math-stirling-local-cache 
+	  (setq math-stirling-local-cache
+                (vconcat math-stirling-local-cache
                          (make-vector (length math-stirling-local-cache) nil)))
 	  (aset math-stirling-cache k math-stirling-local-cache)
 	  (while (< (setq i (1+ i)) (length math-stirling-local-cache))
@@ -572,7 +571,6 @@
 	(let ((i 200))
 	  (while (> (setq i (1- i)) 0)
 	    (math-random-base))))
-    (random t)
     (setq var-RandSeed nil
 	  math-random-cache nil
 	  math-random-shift -4)  ; assume RAND_MAX >= 16383
@@ -629,7 +627,7 @@
          (i (/ (+ n slop) 3))
          (rnum 0))
     (while (> i 0)
-      (setq rnum 
+      (setq rnum
             (math-add
              (math-random-three-digit-number)
              (math-mul rnum 1000)))
@@ -816,18 +814,24 @@
 			 (list nil v)
 		       '(t))))
 		  ((not (equal n (car math-prime-test-cache)))
-		   (cond ((= (% (nth 1 n) 2) 0) '(nil 2))
-			 ((= (% (nth 1 n) 5) 0) '(nil 5))
+		   (cond ((if (consp n)
+                              (= (% (nth 1 n) 2) 0)
+                            (= (% n 2) 0))
+                          '(nil 2))
+			 ((if (consp n)
+                              (= (% (nth 1 n) 5) 0)
+                            (= (% n 5) 0))
+                          '(nil 5))
 			 (t (let ((q n) (sum 0))
                               (while (not (eq q 0))
                                 (setq sum (%
                                            (+
                                             sum
-                                            (calcFunc-mod 
+                                            (calcFunc-mod
                                              q 1000000))
                                            111111))
-                                (setq q 
-                                      (math-quotient 
+                                (setq q
+                                      (math-quotient
                                        q 1000000)))
 			      (cond ((= (% sum 3) 0) '(nil 3))
 				    ((= (% sum 7) 0) '(nil 7))