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

diff --git a/lisp/calc/calc-comb.el b/lisp/calc/calc-comb.el
index 431ea18f58..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.
 
@@ -815,8 +814,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 (%