3 files changed, 14 insertions, 1 deletions

diff --git a/scilab/modules/string/macros/fun2string.sci b/scilab/modules/string/macros/fun2string.sci
index 0fd7094..9947b34 100644
--- a/scilab/modules/string/macros/fun2string.sci
+++ b/scilab/modules/string/macros/fun2string.sci
@@ -18,7 +18,7 @@ function txt=fun2string(fun,nam)
   lcount=1;level=[0,0];
   quote=''''
   dquote='""'
-  CR='\@'
+  CR='\'+ascii(10)
   opstable()
   // add input variable in the defined variables
   inputs=lst(3);outputs=lst(2)
diff --git a/tests/nonRegression/bug2420.sci b/tests/nonRegression/bug2420.sci
new file mode 100644
index 0000000..eaf6604
--- /dev/null
+++ b/tests/nonRegression/bug2420.sci
@@ -0,0 +1,12 @@
+// Scilab Project - Serge Steer
+// Copyright INRIA 2007
+// Date : June 2007
+
+mode(-1) ;
+clear ;
+BugNumber=2420;
+function a=strudel(),a='+\@+';endfunction
+t=fun2string(strudel)    
+T=stripblanks(t(2))=="a = ''+\@+'';"
+affich_result(T,BugNumber) ;
+clear ;
diff --git a/tests/nonRegression/list_nonreg.txt b/tests/nonRegression/list_nonreg.txt
index 344f559..30d40ef 100644
--- a/tests/nonRegression/list_nonreg.txt
+++ b/tests/nonRegression/list_nonreg.txt
@@ -172,6 +172,7 @@
 2407
 2410
 2414
+2420
 2421
 2428
 2429