diff -up tcsh-6.17.00/tests/lexical.at.testsuite tcsh-6.17.00/tests/lexical.at
--- tcsh-6.17.00/tests/lexical.at.testsuite	2008-10-17 21:56:59.000000000 +0200
+++ tcsh-6.17.00/tests/lexical.at	2010-04-08 16:27:27.286413600 +0200
@@ -30,15 +30,15 @@ AT_CLEANUP
 
 AT_SETUP([Comments])
 
-AT_CHECK([echo 'echo OK#comment' | tcsh -f], , [OK
+AT_CHECK([echo 'echo OK@%:@comment' | tcsh -f], , [OK
 ])
 
-AT_CHECK([tcsh -f -c 'echo #no comment'], ,
-[#no comment
+AT_CHECK([tcsh -f -c 'echo @%:@no comment'], ,
+[@%:@no comment
 ])
 
 AT_DATA([comment2.csh],
-[[echo testing...#\
+[[echo testing...@%:@\
 OK
 ]])
 AT_CHECK([tcsh -f comment2.csh], ,
@@ -194,7 +194,7 @@ AT_DATA([nohist.csh],
 [[echo ! space !	tab != "!(" newline !
 ]])
 AT_CHECK([tcsh -f nohist.csh], ,
-[! space ! tab != !( newline !
+[! space ! tab != !@{:@ newline !
 ])
 
 AT_CLEANUP
@@ -230,14 +230,14 @@ AT_CHECK([tcsh -f -q -i < negative.csh],
 [echo 1
 ])
 
-AT_CHECK([echo 'echo !#:0' | tcsh -f -q -i], ,
+AT_CHECK([echo 'echo !@%:@:0' | tcsh -f -q -i], ,
 [> echo
 > exit
 ],
 [echo echo
 ])
 
-AT_CHECK([echo 'echo !#:1' | tcsh -f -q -i], 1,
+AT_CHECK([echo 'echo !@%:@:1' | tcsh -f -q -i], 1,
 [> > exit
 ],
 [Bad ! arg selector.