mention protected in more e-TeX error messages

git-svn-id: svn://tug.org/texlive/trunk@18329 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 36 insertions, 10 deletions

diff --git a/Build/source/texk/web2c/alephdir/ChangeLog b/Build/source/texk/web2c/alephdir/ChangeLog
index 54404717017..520a31befb1 100644
--- a/Build/source/texk/web2c/alephdir/ChangeLog
+++ b/Build/source/texk/web2c/alephdir/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* eobase.ch: Adapt to ../etexdir/etex.ch:
+	More error message with \protected, from Heiko.
+
 2010-04-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* eobase.ch: Adapt to ../etexdir/etex.ch:
diff --git a/Build/source/texk/web2c/alephdir/eobase.ch b/Build/source/texk/web2c/alephdir/eobase.ch
index 07df8966fc9..f4d3494938a 100644
--- a/Build/source/texk/web2c/alephdir/eobase.ch
+++ b/Build/source/texk/web2c/alephdir/eobase.ch
@@ -2726,6 +2726,12 @@ or `\.{\\outer}', and it might or might not be expanded. The prefixes
   if tracing_commands>2 then if eTeX_ex then show_cur_cmd_chr;
 @z
 %---------------------------------------
+@x [49] m.1212 l.22730 - e-TeX protected
+help1("I'll pretend you didn't say \long or \outer or \global.");
+@y
+help1("I'll pretend you didn't say \long or \outer or \global or \protected.");
+@z
+%---------------------------------------
 @x [49] m.1213 l.22686 - e-TeX protected
 if (cur_cmd<>def)and(a mod 4<>0) then
   begin print_err("You can't use `"); print_esc("long"); print("' or `");
@@ -2736,15 +2742,15 @@ if a>=8 then
   end
 else j:=0;
 if (cur_cmd<>def)and((a mod 4<>0)or(j<>0)) then
-  begin print_err("You can't use `"); print_esc("long"); print("', `");
-  print_esc("outer"); print("', or `");
+  begin print_err("You can't use `"); print_esc("long"); print("' or `");
+  print_esc("outer"); print("' or `");
   print_esc("protected"); print("' with `");
 @z
 %---------------------------------------
 @x [49] m.1213 l.22691 - e-TeX protected
   help1("I'll pretend you didn't say \long or \outer here.");
 @y
-  help1("I'll pretend you didn't say \long, \outer, or \protected here.");
+  help1("I'll pretend you didn't say \long or \outer or \protected here.");
 @z
 %---------------------------------------
 @x [49] m.1218 l.22749 - e-TeX protected
diff --git a/Build/source/texk/web2c/etexdir/ChangeLog b/Build/source/texk/web2c/etexdir/ChangeLog
index 4e0e6219396..e8f8210116e 100644
--- a/Build/source/texk/web2c/etexdir/ChangeLog
+++ b/Build/source/texk/web2c/etexdir/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* etex.ch: More error message with \protected, from Heiko.
+
 2010-04-28  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* etex.ch: Checked and adjusted tex.web line numbers.
diff --git a/Build/source/texk/web2c/etexdir/etex.ch b/Build/source/texk/web2c/etexdir/etex.ch
index 6ea1513379d..c7d9a238019 100644
--- a/Build/source/texk/web2c/etexdir/etex.ch
+++ b/Build/source/texk/web2c/etexdir/etex.ch
@@ -2650,6 +2650,12 @@ or `\.{\\outer}', and it might or might not be expanded. The prefixes
   if tracing_commands>2 then if eTeX_ex then show_cur_cmd_chr;
 @z
 %---------------------------------------
+@x [49] m.1212 l.22730 - e-TeX protected
+help1("I'll pretend you didn't say \long or \outer or \global.");
+@y
+help1("I'll pretend you didn't say \long or \outer or \global or \protected.");
+@z
+%---------------------------------------
 @x [49] m.1213 l.22735 - e-TeX protected
 if (cur_cmd<>def)and(a mod 4<>0) then
   begin print_err("You can't use `"); print_esc("long"); print("' or `");
@@ -2660,15 +2666,15 @@ if a>=8 then
   end
 else j:=0;
 if (cur_cmd<>def)and((a mod 4<>0)or(j<>0)) then
-  begin print_err("You can't use `"); print_esc("long"); print("', `");
-  print_esc("outer"); print("', or `");
+  begin print_err("You can't use `"); print_esc("long"); print("' or `");
+  print_esc("outer"); print("' or `");
   print_esc("protected"); print("' with `");
 @z
 %---------------------------------------
 @x [49] m.1213 l.22740 - e-TeX protected
   help1("I'll pretend you didn't say \long or \outer here.");
 @y
-  help1("I'll pretend you didn't say \long, \outer, or \protected here.");
+  help1("I'll pretend you didn't say \long or \outer or \protected here.");
 @z
 %---------------------------------------
 @x [49] m.1218 l.22798 - e-TeX protected
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 27ca59cde55..8accee4519c 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* pdftex.web: Adapt to ../etexdir/etex.ch:
+	More error message with \protected, from Heiko.
+
 2010-04-30  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* pdftex-common.h (xstrdup): Remove decl (in <kpathsea/lib.h>).
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index 1b59712a644..56682ecad22 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -31104,7 +31104,7 @@ exit:end;
 begin print_err("You can't use a prefix with `");
 @.You can't use a prefix with x@>
 print_cmd_chr(cur_cmd,cur_chr); print_char("'");
-help1("I'll pretend you didn't say \long or \outer or \global.");
+help1("I'll pretend you didn't say \long or \outer or \global or \protected.");
 back_error; return;
 end
 
@@ -31114,12 +31114,12 @@ if a>=8 then
   end
 else j:=0;
 if (cur_cmd<>def)and((a mod 4<>0)or(j<>0)) then
-  begin print_err("You can't use `"); print_esc("long"); print("', `");
-  print_esc("outer"); print("', or `");
+  begin print_err("You can't use `"); print_esc("long"); print("' or `");
+  print_esc("outer"); print("' or `");
   print_esc("protected"); print("' with `");
 @.You can't use \\long...@>
   print_cmd_chr(cur_cmd,cur_chr); print_char("'");
-  help1("I'll pretend you didn't say \long, \outer, or \protected here.");
+  help1("I'll pretend you didn't say \long or \outer or \protected here.");
   error;
   end