diff options
| author | Matthias Klose <doko@ubuntu.com> | 2007-08-02 21:33:13 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@ubuntu.com> | 2007-08-02 21:33:13 +0000 |
| commit | 4ad51a4ba75ad4243a610fb1147f2f341bf96483 (patch) | |
| tree | eb0efc3921dde42056e2b1c11185df6757da7df3 | |
| parent | 9ac2b4467c1287cd68e879206e54d4eb248d9ebd (diff) | |
| download | cpython-4ad51a4ba75ad4243a610fb1147f2f341bf96483.tar.gz | |
- Allow Emacs 22 for building the documentation in info format.
| -rw-r--r-- | Doc/info/Makefile | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 1 |
2 files changed, 3 insertions, 2 deletions
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 @@ -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 ----- |