Re: [Emacs-diffs] master 957090b: Merge from origin/emacs-26

Re: [Emacs-diffs] master 957090b: Merge from origin/emacs-26

[Herbert J. Skuhra]

On Fri, 18 Jan 2019 16:55:24 +0100, Glenn Morris wrote:
> 
> branch: master
> commit 957090b79531fbd7729e5d28c3496b9114c1f543
> Merge: 5e3b0f5 b6d78a0
> Author: Glenn Morris <rgm@gnu.org>
> Commit: Glenn Morris <rgm@gnu.org>
> 
>     Merge from origin/emacs-26
>     
>     b6d78a0 (origin/emacs-26) Fix a typo in ELisp manual
>     c9f6f86 Prevent redrawing if frame is garbaged
>     00ba226 Attempt to fix hangs on MS-Windows due to C-g
>     b26d637 Fix Calc graph output on MS-Windows
>     03818b0 Fix a minor mistake in ELisp manual
>     6ac5985 ; Fix some trivial doc typos
>     21b9026 * etc/tutorials/TUTORIAL: Fix typo (bug#34049)
>     d223727 Fix UI of Buffer-menu
>     0f71655 Reinitialize ispell-really-enchant when changing the speller
>     9845044 Speed up loading css-mode
> ---
>  doc/emacs/ChangeLog.1     |  2 +-
>  doc/lispref/buffers.texi  |  3 ++-
>  doc/lispref/nonascii.texi |  5 ++---
>  etc/tutorials/TUTORIAL    |  2 +-
>  lisp/ChangeLog.12         |  2 +-
>  lisp/ChangeLog.7          |  2 +-
>  lisp/buff-menu.el         |  8 ++++----
>  lisp/calc/calc-graph.el   | 35 ++++++++++++++++++++++-------------
>  lisp/calc/calc.el         | 11 +++++++++--
>  lisp/dired.el             |  2 +-
>  lisp/erc/ChangeLog.1      |  2 +-
>  lisp/textmodes/ispell.el  |  1 +
>  src/ChangeLog.11          |  2 +-
>  src/ChangeLog.4           |  2 +-
>  src/nsterm.m              |  8 ++++++++
>  src/w32uniscribe.c        |  6 ++++++
>  src/xdisp.c               | 45 +++++++++++++++++++--------------------------
>  17 files changed, 81 insertions(+), 57 deletions(-)

This commit breaks the build on MacOS:

  CC       xdisp.o
xdisp.c:32413:34: error: use of undeclared identifier 'f'
  while (w && !FRAME_GARBAGED_P (f))
                                 ^
1 error generated.
make[1]: *** [xdisp.o] Error 1
make: *** [src] Error 2

The build succeeds if I revert commit f136a4bf7c65894acbf491cad8d5298662ba4cd1.

--
Herbert

Re: [Emacs-diffs] master 957090b: Merge from origin/emacs-26

[Eli Zaretskii]

> Date: Sat, 19 Jan 2019 11:56:59 +0100
> From: "Herbert J. Skuhra" <herbert@gojira.at>
> 
> This commit breaks the build on MacOS:
> 
>   CC       xdisp.o
> xdisp.c:32413:34: error: use of undeclared identifier 'f'
>   while (w && !FRAME_GARBAGED_P (f))
>                                  ^

Should be fixed now.