[Python-checkins] r56681 - in python/trunk: Doc/info/Makefile Misc/NEWS

Thu Aug 2 23:33:13 CEST 2007

Author: matthias.klose
Date: Thu Aug 2 23:33:13 2007
New Revision: 56681
Modified:
 python/trunk/Doc/info/Makefile
 python/trunk/Misc/NEWS
Log:
- Allow Emacs 22 for building the documentation in info format.
Modified: python/trunk/Doc/info/Makefile
==============================================================================

--- python/trunk/Doc/info/Makefile	(original)
+++ python/trunk/Doc/info/Makefile	Thu Aug 2 23:33:13 2007
@@ -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
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Thu Aug 2 23:33:13 2007
@@ -958,6 +958,7 @@
 
 - Fix the build of the library reference in info format.
 
+- Allow Emacs 22 for building the documentation in info format.
 
 C API
 -----
