Issue building master

[Ergus]

Hi:

I am trying to build the master branch and I am getting this error:

make[2]: Leaving directory 
'/mnt/almacen/repo/gits/emacs/build_arch/admin/charsets'
  CC       xdisp.o
  CC       gtkutil.o
  CC       coding.o
  CC       dbusbind.o
../../src/xdisp.c: In function ‘char_can_wrap_before’:
../../src/xdisp.c:541:8: error: ‘Vword_wrap_by_category’ undeclared (first use 
in this function)
  541 |   if (!Vword_wrap_by_category)
      |        ^~~~~~~~~~~~~~~~~~~~~~
../../src/xdisp.c:541:8: note: each undeclared identifier is reported only once 
for each function it appears in
../../src/xdisp.c: In function ‘char_can_wrap_after’:
../../src/xdisp.c:563:8: error: ‘Vword_wrap_by_category’ undeclared (first use 
in this function)
  563 |   if (!Vword_wrap_by_category)
      |        ^~~~~~~~~~~~~~~~~~~~~~
In file included from ../../src/xdisp.c:439:
../../src/xdisp.c: In function ‘syms_of_xdisp’:
../../src/lisp.h:3094:33: error: ‘struct emacs_globals’ has no member named 
‘f_Vword_wrap_by_category’
 3094 |       = {Lisp_Fwd_Bool, &globals.f_##vname}; \
      |                                 ^
../../src/xdisp.c:34775:3: note: in expansion of macro ‘DEFVAR_BOOL’
34775 |   DEFVAR_BOOL("word-wrap-by-category", Vword_wrap_by_category, doc: /*
      |   ^~~~~~~~~~~
../../src/xdisp.c:34790:3: error: ‘Vword_wrap_by_category’ undeclared (first 
use in this function)
34790 |   Vword_wrap_by_category = false;
      |   ^~~~~~~~~~~~~~~~~~~~~~
  CC       keyboard.o
  CC       macros.o
make[1]: *** [Makefile:401: xdisp.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make[1]: Leaving directory '/mnt/almacen/repo/gits/emacs/build_arch/src'
make: *** [Makefile:424: src] Error 2