when I build emacs-25 with this patch (either by building emacs-25
directly or taking emacs-25.1 and applying this patch) I get a failure
in make:

./autogen.sh
CFLAGS='-O0 -g3 -gdwarf-4' ./configure --enable-checking='yes,glyphs' --enable-check-lisp-object-type --prefix=/opt/emacs25
make

.
.
.
make[2]: Leaving directory '/home/fommil/build/emacs-git/emacs/admin/grammars'
collected 50% ...
collected 60% ...
collected 70% ...
collected 80% ...
collected 90% ...
Processing OKURI-NASI entries ...
processed 10% ...
processed 20% ...
Args out of range: #("崎/
かん" 0 5 (charset japanese-jisx0208)), -6, nil
make[2]: *** [Makefile:142: ../lisp/leim/ja-dic/ja-dic.el] Error 255
make[2]: Leaving directory '/home/fommil/build/emacs-git/emacs/leim'
make[1]: *** [Makefile:320: leim] Error 2
make[1]: Leaving directory '/home/fommil/build/emacs-git/emacs/lisp'
make: *** [Makefile:385: lisp] Error 2