Unbreak bootstrap

* lisp/subr.el (zerop): Revert previous change, which caused
bootstrap to fail with void function cadr.

diff --git a/lisp/subr.el b/lisp/subr.el
index 10343e69db8e017ffcfa717b92ac5a2f90f83846..c1d90e3fb18bfef9c14be0996bc8a39f5d874047 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -359,13 +359,6 @@ was called."
   (lambda (&rest args2)
     (apply fun (append args args2))))
 
-(defun zerop (number)
-  "Return t if NUMBER is zero."
-  ;; Used to be in C, but it's pointless since (= 0 n) is faster anyway because
-  ;; = has a byte-code.
-  (declare (compiler-macro (lambda (_) `(= 0 ,number))))
-  (= 0 number))
-
 \f
 ;;;; List functions.
 
@@ -555,6 +548,13 @@ If N is omitted or nil, remove the last element."
           (if (> n 0) (setcdr (nthcdr (- (1- m) n) list) nil))
           list))))
 
+(defun zerop (number)
+  "Return t if NUMBER is zero."
+  ;; Used to be in C, but it's pointless since (= 0 n) is faster anyway because
+  ;; = has a byte-code.
+  (declare (compiler-macro (lambda (_) `(= 0 ,number))))
+  (= 0 number))
+
 (defun proper-list-p (object)
   "Return OBJECT's length if it is a proper list, nil otherwise.
 A proper list is neither circular nor dotted (i.e., its last cdr