aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2018-07-11 08:27:14 -0700
committerGlenn Morris2018-07-11 08:27:14 -0700
commit78125f37444acd4f1ec4a0a5b0a338d80672f2ec (patch)
tree4aaafe66b5cbfebf4415cbe4d35a10dc44e1ec05
parentbabe0d4508273c5fe0a3228b3d2b4d3dcb72cd58 (diff)
downloademacs-78125f37444acd4f1ec4a0a5b0a338d80672f2ec.tar.gz
emacs-78125f37444acd4f1ec4a0a5b0a338d80672f2ec.zip
Unbreak bootstrap
* lisp/subr.el (zerop): Revert previous change, which caused bootstrap to fail with void function cadr.
-rw-r--r--lisp/subr.el14
1 files 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."
359 (lambda (&rest args2) 359 (lambda (&rest args2)
360 (apply fun (append args args2)))) 360 (apply fun (append args args2))))
361 361
362(defun zerop (number)
363 "Return t if NUMBER is zero."
364 ;; Used to be in C, but it's pointless since (= 0 n) is faster anyway because
365 ;; = has a byte-code.
366 (declare (compiler-macro (lambda (_) `(= 0 ,number))))
367 (= 0 number))
368
369 362
370;;;; List functions. 363;;;; List functions.
371 364
@@ -555,6 +548,13 @@ If N is omitted or nil, remove the last element."
555 (if (> n 0) (setcdr (nthcdr (- (1- m) n) list) nil)) 548 (if (> n 0) (setcdr (nthcdr (- (1- m) n) list) nil))
556 list)))) 549 list))))
557 550
551(defun zerop (number)
552 "Return t if NUMBER is zero."
553 ;; Used to be in C, but it's pointless since (= 0 n) is faster anyway because
554 ;; = has a byte-code.
555 (declare (compiler-macro (lambda (_) `(= 0 ,number))))
556 (= 0 number))
557
558(defun proper-list-p (object) 558(defun proper-list-p (object)
559 "Return OBJECT's length if it is a proper list, nil otherwise. 559 "Return OBJECT's length if it is a proper list, nil otherwise.
560A proper list is neither circular nor dotted (i.e., its last cdr 560A proper list is neither circular nor dotted (i.e., its last cdr