- 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 06450baebf21da8883919b7ce4d17ca63efc4f5c..0b01eaf452df4443d899da99e60bf83511f5c8ad 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -106,6 +106,8 @@ Build
 - Patch #1673122: Use an explicit path to libtool when building a framework. 
   This avoids picking up GNU libtool from a users PATH.
 
+- Allow Emacs 22 for building the documentation in info format.
+
 
 What's New in Python 2.5.1?
 =============================