From: Matthias Klose Date: Thu, 2 Aug 2007 21:33:13 +0000 (+0000) Subject: - Allow Emacs 22 for building the documentation in info format. X-Git-Tag: v2.6a1~1526 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb8ff67fd73b8fa52b5c2d796706a0cd29ba8d71;p=python - Allow Emacs 22 for building the documentation in info format. --- diff --git a/Doc/info/Makefile b/Doc/info/Makefile index 3dbbd747be..a9a037b4d8 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 13ffc04b14..a79810def5 100644 --- 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 -----