Import Debian changes 2c3-3debian/2c3-3

slib (2c3-3) frozen unstable; urgency=low

  * Fixes #16235.
  * Fixes #19943.
  * Fixes #20265.
  * Fixes #24917.
  * Fixes #27389.

slib (2c3-2) frozen unstable; urgency=low

  * Re-uploaded for slink freeze.

slib (2c3-1) unstable; urgency=low

  * New upstream release.

1 files changed, 18 insertions, 15 deletions

diff --git a/factor.scm b/factor.scm
index 6d7b38d..a5c7b44 100644
--- a/factor.scm
+++ b/factor.scm
@@ -130,21 +130,24 @@
 	      (prime:f u (+ v b) (+ b b) (quotient (- n u) 2))))))
 
 (define (prime:factor m)
-  (if
-   (negative? m) (cons -1 (prime:factor (- m)))
-   (let* ((s (gcd m prime:product))
-	  (r (quotient m s)))
-     (if (even? s)
-	 (append
-	  (if (= 1 r) '() (prime:factor r))
-	  (cons 2 (let ((s/2 (quotient s 2)))
-		    (if (= s/2 1) '()
-			(or (prime:f 1 1 2 (quotient (- s/2 1) 2))
-			    (list s/2))))))
-	 (if (= 1 s) (or (prime:f 1 1 2 (quotient (- m 1) 2)) (list m))
-	     (append (if (= 1 r) '()
-			 (or (prime:f 1 1 2 (quotient (- r 1) 2)) (list r)))
-		     (or (prime:f 1 1 2 (quotient (- s 1) 2)) (list s))))))))
+  (case m
+    ((-1 0 1) (list m))
+    (else
+     (if (negative? m) (cons -1 (prime:factor (- m)))
+	 (let* ((s (gcd m prime:product))
+		(r (quotient m s)))
+	   (if (even? s)
+	       (append
+		(if (= 1 r) '() (prime:factor r))
+		(cons 2 (let ((s/2 (quotient s 2)))
+			  (if (= s/2 1) '()
+			      (or (prime:f 1 1 2 (quotient (- s/2 1) 2))
+				  (list s/2))))))
+	       (if (= 1 s) (or (prime:f 1 1 2 (quotient (- m 1) 2)) (list m))
+		   (append
+		    (if (= 1 r) '()
+			(or (prime:f 1 1 2 (quotient (- r 1) 2)) (list r)))
+		    (or (prime:f 1 1 2 (quotient (- s 1) 2)) (list s))))))))))
 
 (define jacobi-symbol prime:jacobi-symbol)
 (define prime? prime:prime?)