summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2010-04-28 15:22:15 +0000
committerTaco Hoekwater <taco@elvenkind.com>2010-04-28 15:22:15 +0000
commit153b1710f3bf4708f349630e311279ce36e41904 (patch)
tree91819a6d6499dc1de24b5e8adc7df3a27b7c19a3
parentfc56e407990a17211161063e5b95fd82653d26a0 (diff)
fix the \protected message for luatex also
git-svn-id: svn://tug.org/texlive/trunk@18034 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/luatexdir/luatex_svnversion.h2
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/maincontrol.w6
3 files changed, 10 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 5c24220b322..c24fc437d80 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-28 Taco Hoekwater <taco@luatex.org>
+
+ * tex/maincontrol.w: Fixed the error message for improper
+ use of \protected, reported by Heiko Oberdiek
+ <heiko.oberdiek@googlemail.com>.
+
2010-04-28 Taco Hoekwater <taco@luatex>
* import of luatex 0.60.1, released version
diff --git a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
index b5ac0b5b7f4..a1df3ebd821 100644
--- a/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
+++ b/Build/source/texk/web2c/luatexdir/luatex_svnversion.h
@@ -1 +1 @@
-#define luatex_svn_revision 3657
+#define luatex_svn_revision 3659
diff --git a/Build/source/texk/web2c/luatexdir/tex/maincontrol.w b/Build/source/texk/web2c/luatexdir/tex/maincontrol.w
index f4b3ddddcaa..38b508f31d3 100644
--- a/Build/source/texk/web2c/luatexdir/tex/maincontrol.w
+++ b/Build/source/texk/web2c/luatexdir/tex/maincontrol.w
@@ -19,7 +19,7 @@
@ @c
static const char _svn_version[] =
- "$Id: maincontrol.w 3587 2010-04-03 14:32:25Z taco $"
+ "$Id: maincontrol.w 3659 2010-04-28 15:10:32Z taco $"
"$URL: http://foundry.supelec.fr/svn/luatex/branches/0.60.x/source/texk/web2c/luatexdir/tex/maincontrol.w $";
#include "ptexlib.h"
@@ -2119,10 +2119,10 @@ void prefixed_command(void)
j = 0;
}
if ((cur_cmd != def_cmd) && ((a % 4 != 0) || (j != 0))) {
- print_err("You can't use `\\long' or `\\outer' with `");
+ print_err("You can't use `\\long' or `\\outer' or `\\protected' with `");
print_cmd_chr((quarterword) cur_cmd, cur_chr);
print_char('\'');
- help1("I'll pretend you didn't say \\long or \\outer here.");
+ help1("I'll pretend you didn't say \\long or \\outer or \\protected here.");
error();
}