From 78125f37444acd4f1ec4a0a5b0a338d80672f2ec Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 11 Jul 2018 08:27:14 -0700 Subject: [PATCH] Unbreak bootstrap * lisp/subr.el (zerop): Revert previous change, which caused bootstrap to fail with void function cadr. --- lisp/subr.el | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/subr.el b/lisp/subr.el index 10343e69db8..c1d90e3fb18 100644 --- 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)) - ;;;; 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 -- 2.39.2