Both sets of patches have been pushed. The changes to the Autoconf manual are slightly different in the version I committed, I found some small errors on proofreading the patch.
According to https://codesearch.debian.net/search?q=-pkg%3Aautoconf+%5CbAC_DIAGNOSE%5Cb&literal=0 this would have been a problem for macros distributed by gettext and libtool as well as automake, and maybe more (I didn't read through all 853 pages :-) so I'm glad you caught it. zw
