Re: make fails on current version

[Toby Cubitt <tsc25@cantab.net>]

[-- Attachment #1: Type: text/plain, Size: 992 bytes --]

On Mon, Apr 23, 2012 at 09:57:25AM -0700, Richard Stanton wrote:
> I just updated org-mode and typed "make". Two problems:
> 
> 1) The doc file seems to have trouble:
> 
> org.texi:6703: Misplaced {.
> org.texi:6703: Misplaced }.
> makeinfo: Removing output file `org' due to errors; use --force to
> preserve.

The problem's in the texinfo documentation for the new %<n> capture
template expandos...but please don't shoot me, it's not my fault! (I just
modified the change that Bastien had already committed to org.texi.)

From the texinfo documentation, it looks like literal "{" and "}" have to
be escaped with "@". Patch attached.


> 2) org-install.el doesn't get created.
> 
> From org-version.el, this is git version "release_7.8.09-375-gb7982a"
> (org-version just returns N/A).

No idea about this one.

Toby
-- 
Dr T. S. Cubitt
Mathematics and Quantum Information group
Department of Mathematics
Complutense University
Madrid, Spain

email: tsc25@cantab.net
web:   www.dr-qubit.org

[-- Attachment #2: 0001-Fixed-bug-in-texinfo-documentation.patch --]
[-- Type: text/x-patch, Size: 1044 bytes --]

From 9fd3ba1bdfbb3b608fcd86ded73f02c53d50e05d Mon Sep 17 00:00:00 2001
From: "Toby S. Cubitt" <tsc25@cantab.net>
Date: Mon, 23 Apr 2012 19:25:57 +0200
Subject: [PATCH] Fixed bug in texinfo documentation.

* doc/org.texi: Escape literal {}'s.
---
 doc/org.texi |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/doc/org.texi b/doc/org.texi
index bb98713..18dba90 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -6700,7 +6700,7 @@ dynamic insertion of content.  The templates are expanded in the order given her
             @r{You may specify a default value and a completion table with}
             @r{%^@{prompt|default|completion2|completion3...@}.}
             @r{The arrow keys access a prompt-specific history.}
-%<n>        @r{Insert the text entered at the nth %^{prompt}, where <n> is}
+%<n>        @r{Insert the text entered at the nth %^@{prompt@}, where <n> is}
             @r{a number, starting from 1.}
 %?          @r{After completing the template, position cursor here.}
 @end smallexample
-- 
1.7.8.5