From 979f5cd3e0e2d74c249d01f126bec9f2496c33f1 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Thu, 2 Aug 2007 21:28:57 +0000 Subject: [PATCH] - Allow Emacs 22 for building the documentation in info format. --- Doc/info/Makefile | 4 ++-- Misc/NEWS | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Doc/info/Makefile b/Doc/info/Makefile index 3dbbd747bec..a9a037b4d81 100644 --- 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 06450baebf2..0b01eaf452d 100644 --- 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? =============================