From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master babe0d4: Rearrange definition of zerop in subr.el Date: Wed, 11 Jul 2018 09:01:28 -0500 Message-ID: <87efg9c1mv.fsf_-_@red-bean.com> References: <87fu3vdjjk.fsf@tcd.ie> <87bmcqhhsf.fsf@tcd.ie> <87in6xgtpb.fsf@tcd.ie> <2af892df-26cb-60b2-4fd8-067fcb3d32e9@cs.ucla.edu> <87r2kh9uwx.fsf@tcd.ie> <83h8lcnbxb.fsf@gnu.org> <87sh4s9poo.fsf@tcd.ie> <87k1q49p0i.fsf@tcd.ie> <87efgbbq2p.fsf@tcd.ie> Reply-To: Karl Fogel NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1531317728 28393 195.159.176.226 (11 Jul 2018 14:02:08 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 11 Jul 2018 14:02:08 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jul 11 16:02:04 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fdFgy-0007Hg-DH for ged-emacs-devel@m.gmane.org; Wed, 11 Jul 2018 16:02:04 +0200 Original-Received: from localhost ([::1]:53942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdFj5-0001fu-Il for ged-emacs-devel@m.gmane.org; Wed, 11 Jul 2018 10:04:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59520) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdFgY-0000fZ-Ty for emacs-devel@gnu.org; Wed, 11 Jul 2018 10:01:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdFgS-0004O8-Ls for emacs-devel@gnu.org; Wed, 11 Jul 2018 10:01:39 -0400 Original-Received: from mail-io0-x22f.google.com ([2607:f8b0:4001:c06::22f]:32964) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdFgS-0004Mm-FS for emacs-devel@gnu.org; Wed, 11 Jul 2018 10:01:32 -0400 Original-Received: by mail-io0-x22f.google.com with SMTP id z20-v6so23677858iol.0 for ; Wed, 11 Jul 2018 07:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:references:references:reply-to:date :in-reply-to:message-id:user-agent:mime-version :content-transfer-encoding; bh=JcDu8iBmqfXs8e5iW4T65yOJ+FNXEw9KP45xpCCwIpo=; b=VIzct6BAWFp94oJCJ6vNh2Okdx6BtF5hzVdZljrxy9PWNSxa7bzpgiU4Vb2OF3sFh0 Vqw805T0SuQkjJzQ8xGvW1QSLiOxTaBsf9IhScGmG0o4FGFMVWIvoAcmrwCjjFBLW4gJ ustgWOL7Kc/OvzYviTxplrvVGi4yPy5kqsN97F9ne5QP3eVibJ/4BEPMzXlvK3088dVD D94INjD6XNK6PGtRJXBrW5ydJ+Kou//TlNPajO4IznlLD4AyRz7HYqrHaldlu9gSDDq/ NSGokWJneHdTF0UQnC0NYgmK4HIEEwlVMFUHngTaZHePHJ2ffaKnfwP2OG2rCx6pbhlR ivyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:references:references :reply-to:date:in-reply-to:message-id:user-agent:mime-version :content-transfer-encoding; bh=JcDu8iBmqfXs8e5iW4T65yOJ+FNXEw9KP45xpCCwIpo=; b=dceFm9qqdTd3l23KSQq9XN+SsQkg1TX0/qAKWF+DH55hhtLeuN2ANrbnP45fxaKmLu k/5bxqu9v2fIYmg1VcLdnM6yjFrTJCDEuJjCZTBoewG6+jOnAPFjqIDz4Tem10qNk0nl rhEStgHFvf6dFaDgDBomtlL7oEbr1YCL/k5mBmNA2tcA/KT4f+K6WXI2RQQ3xYLC4fQ7 ocihfK+odxYvuCm/eOFQ2rIgK5uePjakvyp5EfTIJHKv+HEMwUiia9yp0rwB+eTWans4 urgoqYzRgBFyQ6q4b0kpMkMqNTZMkCbdP4GTYzjTn2dWz527jH0XrDdIGbCpzXG2Wyhn SB1A== X-Gm-Message-State: AOUpUlGxXq5Hy091Hi4i5h3kwbjLZ88MdaXYNC6bmA22Zwwpcf+rk4IU 0sDL9zhm4FnlDt0WcmeXtAeFBQ== X-Google-Smtp-Source: AAOMgpcxdvhfEikw0AMMoxUkYTNkiu9S2LEUppbChXDvhMIlkmY7jSARKETQmS5xkF5tl7DwdAGpew== X-Received: by 2002:a5e:de42:: with SMTP id e2-v6mr1307896ioq.235.1531317690733; Wed, 11 Jul 2018 07:01:30 -0700 (PDT) Original-Received: from kwork (74-92-190-114-Illinois.hfc.comcastbusiness.net. [74.92.190.114]) by smtp.gmail.com with ESMTPSA id u129-v6sm1281240ita.5.2018.07.11.07.01.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Jul 2018 07:01:30 -0700 (PDT) Original-References: <20180711060905.55C0D209E0@vcs0.savannah.gnu.org> In-Reply-To: (Paul Eggert's message of "Tue, 10 Jul 2018 20:02:03 -0700") X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4001:c06::22f X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:227248 Archived-At: Paul Eggert wrote on emacs-devel: >Naahhh, I simply overlooked them. Sorry about that. I installed the >2nd patch into the emacs-26 branch (since it's just documentation >wording cleanup) and the 3rd one into master. Hunh -- I'm not sure why, but that 3rd patch seems to be leading to build l= ossage on 'master'. Quoting below from 'emacs-diffs': >branch: master >commit babe0d4508273c5fe0a3228b3d2b4d3dcb72cd58 >Author: Basil L. Contovounesios >Commit: Paul Eggert > > ; Rearrange definition of zerop in subr.el >=20=20=20=20 > * lisp/subr.el (zerop): Move from under 'List functions' heading to > under 'Basic Lisp functions' heading. >--- > lisp/subr.el | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > >diff --git a/lisp/subr.el b/lisp/subr.el >index c1d90e3..10343e6 100644 >--- a/lisp/subr.el >+++ b/lisp/subr.el >@@ -359,6 +359,13 @@ was called." > (lambda (&rest args2) > (apply fun (append args args2)))) >=20 >+(defun zerop (number) >+ "Return t if NUMBER is zero." >+ ;; Used to be in C, but it's pointless since (=3D 0 n) is faster anyway= because >+ ;; =3D has a byte-code. >+ (declare (compiler-macro (lambda (_) `(=3D 0 ,number)))) >+ (=3D 0 number)) >+ > > ;;;; List functions. >=20 >@@ -548,13 +555,6 @@ If N is omitted or nil, remove the last element." > (if (> n 0) (setcdr (nthcdr (- (1- m) n) list) nil)) > list)))) >=20 >-(defun zerop (number) >- "Return t if NUMBER is zero." >- ;; Used to be in C, but it's pointless since (=3D 0 n) is faster anyway= because >- ;; =3D has a byte-code. >- (declare (compiler-macro (lambda (_) `(=3D 0 ,number)))) >- (=3D 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 Here's the build failure that seems to happen with that commit: $ git checkout master Switched to branch 'master' Your branch is up to date with 'origin/master'. $ git log --name-status -n 2 commit babe0d4508273c5fe0a3228b3d2b4d3dcb72cd58 (HEAD -> master, origin/m= aster, origin/HEAD) Author: Basil L. Contovounesios Date: Tue Jul 10 23:08:58 2018 -0700 =20=20 ; Rearrange definition of zerop in subr.el =20=20=20=20=20=20 * lisp/subr.el (zerop): Move from under 'List functions' heading to under 'Basic Lisp functions' heading. =20=20 M lisp/subr.el =20=20 commit f8b1e40fb63b0a6bc6692cc0bc84e5f5e65c2644 Author: Stefan Monnier Date: Tue Jul 10 22:52:21 2018 -0400 =20=20 * lisp/vc/diff-mode.el: Perform hunk refinement from font-lock =20=20=20=20=20=20 Remove redundant :group arguments. (diff-font-lock-refine): New var. (diff--refine-hunk): New function, extracted from diff-refine-hunk. (diff-refine-hunk): Use it. (diff--font-lock-refine--refresh): New function. (diff--font-lock-refined): New function. (diff-font-lock-keywords): Use it. =20=20 M lisp/vc/diff-mode.el $ make distclean $ ./autogen.sh && ./configure --with-mailutils $ make bootstrap [...much output omitted...] CCLD temacs /bin/mkdir -p ../etc setfattr -n user.pax.flags -v er temacs make -C ../lisp update-subdirs make[3]: Entering directory '/home/kfogel/src/emacs/lisp' make[3]: Leaving directory '/home/kfogel/src/emacs/lisp' ./temacs --batch --load loadup bootstrap Loading loadup.el (source)... Using load-path (/home/kfogel/src/emacs/lisp=20 /home/kfogel/src/emacs/lisp/emacs-lisp /home/kfogel/src/emacs/lisp/progmodes=20 /home/kfogel/src/emacs/lisp/language /home/kfogel/src/emacs/lisp/international=20 /home/kfogel/src/emacs/lisp/textmodes=20 /home/kfogel/src/emacs/lisp/vc) Loading emacs-lisp/byte-run (source)... Loading emacs-lisp/backquote (source)... Loading subr (source)... Symbol=E2=80=99s function definition is void: cadr Makefile:746: recipe for target 'bootstrap-emacs' failed make[2]: *** [bootstrap-emacs] Error 255 make[2]: Leaving directory '/home/kfogel/src/emacs/src' Makefile:418: recipe for target 'src' failed make[1]: *** [src] Error 2 make[1]: Leaving directory '/home/kfogel/src/emacs' Makefile:1101: recipe for target 'bootstrap' failed make: *** [bootstrap] Error 2 $=20 But if I revert to the previous revision, the build succeeds: $ git checkout f8b1e40fb63b0a6bc6692cc0bc84e5f5e65c2644 $ git status HEAD detached at f8b1e40fb6 nothing to commit, working tree clean $ make distclean $ ./autogen.sh && ./configure --with-mailutils $ make bootstrap [... no problems ...] $=20 I won't have time to look at this further for probably the rest of today, s= o am posting in case anyone sees the problem right away. Best regards, -Karl