- Allow Emacs 22 for building the documentation in info format.
diff --git a/Doc/info/Makefile b/Doc/info/Makefile
index 3dbbd74..a9a037b 100644
--- a/Doc/info/Makefile
+++ b/Doc/info/Makefile
@@ -34,10 +34,10 @@
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 06450ba..0b01eaf 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -106,6 +106,8 @@
- 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?
=============================