- Allow Emacs 22 for building the documentation in info format.

diff --git a/Doc/info/Makefile b/Doc/info/Makefile
index 3dbbd747becd0360275761ca35037c3d11784d2d..a9a037b4d819e392a0fdeffa8eaa2b91f9e220f2 100644 (file)
--- a/Doc/info/Makefile
+++ b/Doc/info/Makefile
@@ -34,10 +34,10 @@ $(WHATSNEW):        python$(VERSION)-$(WHATSNEW).info
 
 check-emacs-version:
        @v="`$(EMACS) --version 2>&1 | egrep '^(GNU |X)Emacs [12]*'`"; \
-       if `echo "$$v" | grep '^GNU Emacs 21' >/dev/null 2>&1`; then \
+       if `echo "$$v" | grep '^GNU Emacs 2[12]' >/dev/null 2>&1`; then \
          echo "Using $(EMACS) to build the info docs"; \
        else \
-         echo "GNU Emacs 21 is required to build the info docs"; \
+         echo "GNU Emacs 21 or 22 is required to build the info docs"; \
          echo "Found $$v"; \
          false; \
        fi

diff --git a/Misc/NEWS b/Misc/NEWS
index 13ffc04b14c7e2e6a96475add835f7c0f9172908..a79810def523c35fb67aa8fbc50e99d24d661072 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -958,6 +958,7 @@ Build
 
 - Fix the build of the library reference in info format.
 
+- Allow Emacs 22 for building the documentation in info format.
 
 C API
 -----