[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 78125f3: Unbreak bootstrap
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 78125f3: Unbreak bootstrap |
Date: |
Wed, 11 Jul 2018 11:27:32 -0400 (EDT) |
branch: master
commit 78125f37444acd4f1ec4a0a5b0a338d80672f2ec
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
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 10343e6..c1d90e3 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 78125f3: Unbreak bootstrap,
Glenn Morris <=