Re: [Emacs-diffs] master babe0d4: Rearrange definition of zerop in subr.el

[Karl Fogel]

Paul Eggert <address@hidden> 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 
lossage on 'master'.  Quoting below from 'emacs-diffs':

>branch: master
>commit babe0d4508273c5fe0a3228b3d2b4d3dcb72cd58
>Author: Basil L. Contovounesios <address@hidden>
>Commit: Paul Eggert <address@hidden>
>
>    ; Rearrange definition of zerop in subr.el
>    
>    * 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))))
> 
>+(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.
> 
>@@ -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))))
> 
>-(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

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/master, origin/HEAD)
  Author: Basil L. Contovounesios <address@hidden>
  Date:   Tue Jul 10 23:08:58 2018 -0700
  
      ; Rearrange definition of zerop in subr.el
      
      * lisp/subr.el (zerop): Move from under 'List functions' heading to
      under 'Basic Lisp functions' heading.
  
  M     lisp/subr.el
  
  commit f8b1e40fb63b0a6bc6692cc0bc84e5f5e65c2644
  Author: Stefan Monnier <address@hidden>
  Date:   Tue Jul 10 22:52:21 2018 -0400
  
      * lisp/vc/diff-mode.el: Perform hunk refinement from font-lock
      
      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.
  
  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 
                   /home/kfogel/src/emacs/lisp/emacs-lisp
                   /home/kfogel/src/emacs/lisp/progmodes 
                   /home/kfogel/src/emacs/lisp/language
                   /home/kfogel/src/emacs/lisp/international 
                   /home/kfogel/src/emacs/lisp/textmodes 
                   /home/kfogel/src/emacs/lisp/vc)
  Loading emacs-lisp/byte-run (source)...
  Loading emacs-lisp/backquote (source)...
  Loading subr (source)...
  Symbol’s 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
  $ 

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 ...]
  $ 

I won't have time to look at this further for probably the rest of today, so am 
posting in case anyone sees the problem right away.

Best regards,
-Karl