* calc/calc-comb.el (math-prime-test): Don't assume large integers are

  represented by lists.

* doc/misc/calc.el (Data Type Formats): Don't specify the size at
  which integers begin to be represented by lists.

2 files changed, 13 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 914826db0b5..542a9108d32 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-17  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc/calc-comb.el (math-prime-test): Don't assume large integers are
+        represented by lists.
+
 2013-10-16  Glenn Morris  <rgm@gnu.org>
 
         * tmm.el (tmm--history): New dynamic variable.
diff --git a/lisp/calc/calc-comb.el b/lisp/calc/calc-comb.el
index e09bef0b5c9..1a2d6092196 100644
--- a/lisp/calc/calc-comb.el
+++ b/lisp/calc/calc-comb.el
@@ -815,8 +815,14 @@
                          (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 (%