Merge commit 'origin/5.2'

73 files changed, 168 insertions, 41 deletions

diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 1bb45fa..70c8242 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -1081,6 +1081,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index bb18c45..866cad5 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -1137,6 +1137,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 0b5b8ee..065d7b4 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -1309,6 +1309,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index a42a90e..d1640d3 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -816,6 +816,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index 99127e5..e624739 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -1114,6 +1114,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index 89c73b4..d24e5d3 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -1977,6 +1977,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index 67c21db..34bd80c 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -1113,6 +1113,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index 482c7d9..587bc5f 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -817,6 +817,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in
index 42dc95b..68a1f59 100644
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -1258,6 +1258,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index a8b8f27..9eaea3c 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -1231,6 +1231,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index 8c2351d..13059f4 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -2976,6 +2976,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index bf5fa0e..089c37d 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -1283,6 +1283,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in
index 7457de2..4913c33 100644
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -841,6 +841,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index 736a1aa..12b130b 100644
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -813,6 +813,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index 133201e..e0510b6 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -1660,6 +1660,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in
index 55fc80b..b1b6c90 100644
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -1083,6 +1083,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index 4d11066..e7121d2 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -1254,6 +1254,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index 0db03e5..c5d9671 100644
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -3219,6 +3219,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/fftw/Makefile.in b/scilab/modules/fftw/Makefile.in
index ccbd1b1..e01dfa4 100644
--- a/scilab/modules/fftw/Makefile.in
+++ b/scilab/modules/fftw/Makefile.in
@@ -1167,6 +1167,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in
index 1b69eb3..a281b6e 100644
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -1891,6 +1891,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in
index 510643a..e0c6659 100644
--- a/scilab/modules/functions/Makefile.in
+++ b/scilab/modules/functions/Makefile.in
@@ -1173,6 +1173,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/genetic_algorithms/Makefile.in b/scilab/modules/genetic_algorithms/Makefile.in
index 27bb2a7..26f12c5 100644
--- a/scilab/modules/genetic_algorithms/Makefile.in
+++ b/scilab/modules/genetic_algorithms/Makefile.in
@@ -818,6 +818,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in
index 63ac660..c054527 100644
--- a/scilab/modules/graphic_export/Makefile.in
+++ b/scilab/modules/graphic_export/Makefile.in
@@ -1325,6 +1325,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index b100e37..8c9baa9 100644
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -4866,6 +4866,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/graphics/src/c/sciCall.c b/scilab/modules/graphics/src/c/sciCall.c
index 3c6fa14..227ec11 100644
--- a/scilab/modules/graphics/src/c/sciCall.c
+++ b/scilab/modules/graphics/src/c/sciCall.c
@@ -39,6 +39,7 @@
 #include "DrawingBridge.h"
 #include "Plot2d.h"
 #include "HandleManagement.h"
+#include "stack-def.h" /* bsiz */
 
 /**
  * Put min and max of vector in dMin and dMax.
diff --git a/scilab/modules/gui/Makefile.in b/scilab/modules/gui/Makefile.in
index 4ad1e38..72791ba 100644
--- a/scilab/modules/gui/Makefile.in
+++ b/scilab/modules/gui/Makefile.in
@@ -2563,6 +2563,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/hdf5/Makefile.in b/scilab/modules/hdf5/Makefile.in
index 2dae2ca..4cfa1be 100644
--- a/scilab/modules/hdf5/Makefile.in
+++ b/scilab/modules/hdf5/Makefile.in
@@ -1239,6 +1239,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index 6d9476c..579339f 100644
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -1435,6 +1435,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/history_manager/Makefile.in b/scilab/modules/history_manager/Makefile.in
index 3757b7a..ee7065f 100644
--- a/scilab/modules/history_manager/Makefile.in
+++ b/scilab/modules/history_manager/Makefile.in
@@ -1334,6 +1334,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/integer/Makefile.in b/scilab/modules/integer/Makefile.in
index 5755cc7..043f1d9 100644
--- a/scilab/modules/integer/Makefile.in
+++ b/scilab/modules/integer/Makefile.in
@@ -1708,6 +1708,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index f68c012..260b75c 100644
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -1188,6 +1188,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 1be051c..1c4fe5a 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -1262,6 +1262,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in
index 5337608..68a3c7a 100644
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -1327,6 +1327,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in
index 67f7af3..6409d24 100644
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -1196,6 +1196,7 @@ uninstall-am: uninstall-libjavasci_la_etcDATA \
 @JAVASCI_TRUE@          if test -d $(srcdir)/$$dir/; then \
 @JAVASCI_TRUE@                  FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
 @JAVASCI_TRUE@                  if test -n "$(MACROSSPECIALEXT)"; then \
+@JAVASCI_TRUE@                          specialExtDir=""; \
 @JAVASCI_TRUE@                          for specialExt in $(MACROSSPECIALEXT); do \
 @JAVASCI_TRUE@                                  specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
 @JAVASCI_TRUE@                          done; \
diff --git a/scilab/modules/jvm/Makefile.in b/scilab/modules/jvm/Makefile.in
index ecc2a4b..eb253f7 100644
--- a/scilab/modules/jvm/Makefile.in
+++ b/scilab/modules/jvm/Makefile.in
@@ -1317,6 +1317,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/linear_algebra/Makefile.in b/scilab/modules/linear_algebra/Makefile.in
index 11262ab..de37c71 100644
--- a/scilab/modules/linear_algebra/Makefile.in
+++ b/scilab/modules/linear_algebra/Makefile.in
@@ -1511,6 +1511,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/localization/Makefile.in b/scilab/modules/localization/Makefile.in
index f0b7b16..a5e5360 100644
--- a/scilab/modules/localization/Makefile.in
+++ b/scilab/modules/localization/Makefile.in
@@ -1188,6 +1188,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/m2sci/Makefile.in b/scilab/modules/m2sci/Makefile.in
index 973b373..14ed174 100644
--- a/scilab/modules/m2sci/Makefile.in
+++ b/scilab/modules/m2sci/Makefile.in
@@ -813,6 +813,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/maple2scilab/Makefile.in b/scilab/modules/maple2scilab/Makefile.in
index 48cb10c..8dd5649 100644
--- a/scilab/modules/maple2scilab/Makefile.in
+++ b/scilab/modules/maple2scilab/Makefile.in
@@ -811,6 +811,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/matio/Makefile.in b/scilab/modules/matio/Makefile.in
index b6c0386..ed6f6ae 100644
--- a/scilab/modules/matio/Makefile.in
+++ b/scilab/modules/matio/Makefile.in
@@ -1268,6 +1268,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/mexlib/Makefile.in b/scilab/modules/mexlib/Makefile.in
index a1864b2..be94ed5 100644
--- a/scilab/modules/mexlib/Makefile.in
+++ b/scilab/modules/mexlib/Makefile.in
@@ -1080,6 +1080,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/optimization/Makefile.in b/scilab/modules/optimization/Makefile.in
index c148ce3..3fa64c3 100644
--- a/scilab/modules/optimization/Makefile.in
+++ b/scilab/modules/optimization/Makefile.in
@@ -1563,6 +1563,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/output_stream/Makefile.in b/scilab/modules/output_stream/Makefile.in
index 613b808..bf6471e 100644
--- a/scilab/modules/output_stream/Makefile.in
+++ b/scilab/modules/output_stream/Makefile.in
@@ -1438,6 +1438,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/overloading/Makefile.in b/scilab/modules/overloading/Makefile.in
index 65029cc..5939376 100644
--- a/scilab/modules/overloading/Makefile.in
+++ b/scilab/modules/overloading/Makefile.in
@@ -813,6 +813,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/parameters/Makefile.in b/scilab/modules/parameters/Makefile.in
index e08ee06..4f75c15 100644
--- a/scilab/modules/parameters/Makefile.in
+++ b/scilab/modules/parameters/Makefile.in
@@ -815,6 +815,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/polynomials/Makefile.in b/scilab/modules/polynomials/Makefile.in
index d6efa1f..78be85a 100644
--- a/scilab/modules/polynomials/Makefile.in
+++ b/scilab/modules/polynomials/Makefile.in
@@ -1517,6 +1517,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/pvm/Makefile.in b/scilab/modules/pvm/Makefile.in
index ba7ccaa..8c926bc 100644
--- a/scilab/modules/pvm/Makefile.in
+++ b/scilab/modules/pvm/Makefile.in
@@ -1551,6 +1551,7 @@ uninstall-am: uninstall-libscipvm_la_etcDATA \
 @PVM_TRUE@              if test -d $(srcdir)/$$dir/; then \
 @PVM_TRUE@                      FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
 @PVM_TRUE@                      if test -n "$(MACROSSPECIALEXT)"; then \
+@PVM_TRUE@                              specialExtDir=""; \
 @PVM_TRUE@                              for specialExt in $(MACROSSPECIALEXT); do \
 @PVM_TRUE@                                      specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
 @PVM_TRUE@                              done; \
@@ -1735,6 +1736,7 @@ uninstall-am: uninstall-libscipvm_la_etcDATA \
 @PVM_FALSE@             if test -d $(srcdir)/$$dir/; then \
 @PVM_FALSE@                     FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
 @PVM_FALSE@                     if test -n "$(MACROSSPECIALEXT)"; then \
+@PVM_FALSE@                             specialExtDir=""; \
 @PVM_FALSE@                             for specialExt in $(MACROSSPECIALEXT); do \
 @PVM_FALSE@                                     specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
 @PVM_FALSE@                             done; \
diff --git a/scilab/modules/randlib/Makefile.in b/scilab/modules/randlib/Makefile.in
index f275e11..727361e 100644
--- a/scilab/modules/randlib/Makefile.in
+++ b/scilab/modules/randlib/Makefile.in
@@ -1220,6 +1220,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/renderer/Makefile.in b/scilab/modules/renderer/Makefile.in
index 2176a10..a045f98 100644
--- a/scilab/modules/renderer/Makefile.in
+++ b/scilab/modules/renderer/Makefile.in
@@ -3631,6 +3631,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/SpecialTextObjectGL.java b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/SpecialTextObjectGL.java
index cdd33fc..d6fe1e0 100644
--- a/scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/SpecialTextObjectGL.java
+++ b/scilab/modules/renderer/src/java/org/scilab/modules/renderer/textDrawing/SpecialTextObjectGL.java
@@ -16,8 +16,19 @@ import java.awt.Color;
 
 import com.sun.opengl.util.texture.Texture;
 
+/**
+ * Special text object 
+ * @author Calixte Denizet
+ */
 public abstract class SpecialTextObjectGL {
-    
+
+    private static final int ALPHA_SHIFT = 24;
+    private static final int RED_SHIFT = 16;
+    private static final int GREEN_SHIFT = 8;
+    private static final int BLUE_SHIFT = 0;
+    private static final int COMPONENT_MASK = 0xFF;
+    private static final int NB_COMPONENTS = 4;
+
     protected Buffer buffer;
     protected float height;
     protected float width;
@@ -25,6 +36,9 @@ public abstract class SpecialTextObjectGL {
 
     protected boolean isColored;
 
+    /**
+     * Default constructor
+     */
     public SpecialTextObjectGL() {
     }
 
@@ -115,20 +129,21 @@ public abstract class SpecialTextObjectGL {
      * @return pixmap RGBA data 
      */
     protected static byte[] ARGBtoRGBA(int[] pix) {
-                byte[] bytes = new byte[pix.length * 4];
-                int p, r, g, b, a;
+                byte[] bytes = new byte[pix.length * NB_COMPONENTS];
+                int p;
+                int [] tmpPix = new int[NB_COMPONENTS];
                 int j = 0;
                 for (int i = 0; i < pix.length; i++) {
                     p = pix[i];
-                    a = (p >> 24) & 0xFF;
-                    r = (p >> 16) & 0xFF;
-                    g = (p >> 8) & 0xFF;
-                    b = (p >> 0) & 0xFF;
-                    bytes[j] = (byte) r;
-                    bytes[j + 1] = (byte) g;
-                    bytes[j + 2] = (byte) b;
-                    bytes[j + 3] = (byte) a;
-                    j += 4;
+                    tmpPix[0] = (p >> ALPHA_SHIFT) & COMPONENT_MASK;
+                    tmpPix[1] = (p >> RED_SHIFT) & COMPONENT_MASK;
+                    tmpPix[2] = (p >> GREEN_SHIFT) & COMPONENT_MASK;
+                    tmpPix[NB_COMPONENTS - 1] = (p >> BLUE_SHIFT) & COMPONENT_MASK;
+                    bytes[j] = (byte) tmpPix[1];
+                    bytes[j + 1] = (byte) tmpPix[2];
+                    bytes[j + 2] = (byte) tmpPix[NB_COMPONENTS - 1];
+                    bytes[j + NB_COMPONENTS - 1] = (byte) tmpPix[0];
+                    j += NB_COMPONENTS;
                 }
                 
                 return bytes;
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index 8b79666..4511fcd 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -2355,6 +2355,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index d6a4e1a..0e9a6ce6 100644
--- a/scilab/modules/scicos_blocks/Makefile.in
+++ b/scilab/modules/scicos_blocks/Makefile.in
@@ -4996,6 +4996,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/shell/Makefile.in b/scilab/modules/shell/Makefile.in
index d63837d..40c9fc0 100644
--- a/scilab/modules/shell/Makefile.in
+++ b/scilab/modules/shell/Makefile.in
@@ -1250,6 +1250,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/signal_processing/Makefile.in b/scilab/modules/signal_processing/Makefile.in
index 25b8156..6c8cb9c 100644
--- a/scilab/modules/signal_processing/Makefile.in
+++ b/scilab/modules/signal_processing/Makefile.in
@@ -1444,6 +1444,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/simulated_annealing/Makefile.in b/scilab/modules/simulated_annealing/Makefile.in
index 1230caf..cb5979b 100644
--- a/scilab/modules/simulated_annealing/Makefile.in
+++ b/scilab/modules/simulated_annealing/Makefile.in
@@ -818,6 +818,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/sound/Makefile.in b/scilab/modules/sound/Makefile.in
index dc43cb9..c020b96 100644
--- a/scilab/modules/sound/Makefile.in
+++ b/scilab/modules/sound/Makefile.in
@@ -1032,6 +1032,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/sparse/Makefile.in b/scilab/modules/sparse/Makefile.in
index a752751..59fd942 100644
--- a/scilab/modules/sparse/Makefile.in
+++ b/scilab/modules/sparse/Makefile.in
@@ -1827,6 +1827,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/special_functions/Makefile.in b/scilab/modules/special_functions/Makefile.in
index 96a58c0..098a792 100644
--- a/scilab/modules/special_functions/Makefile.in
+++ b/scilab/modules/special_functions/Makefile.in
@@ -1229,6 +1229,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/spreadsheet/Makefile.in b/scilab/modules/spreadsheet/Makefile.in
index 967b26f..dad4b41 100644
--- a/scilab/modules/spreadsheet/Makefile.in
+++ b/scilab/modules/spreadsheet/Makefile.in
@@ -1117,6 +1117,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/statistics/Makefile.in b/scilab/modules/statistics/Makefile.in
index bfa5a7a..5516bdd 100644
--- a/scilab/modules/statistics/Makefile.in
+++ b/scilab/modules/statistics/Makefile.in
@@ -1420,6 +1420,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/string/Makefile.in b/scilab/modules/string/Makefile.in
index 5b29256..9e25e54 100644
--- a/scilab/modules/string/Makefile.in
+++ b/scilab/modules/string/Makefile.in
@@ -1566,6 +1566,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/symbolic/Makefile.in b/scilab/modules/symbolic/Makefile.in
index 9d47ad5..4bbe98c 100644
--- a/scilab/modules/symbolic/Makefile.in
+++ b/scilab/modules/symbolic/Makefile.in
@@ -1088,6 +1088,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/tclsci/Makefile.in b/scilab/modules/tclsci/Makefile.in
index 2225ee1..8ad8d3d 100644
--- a/scilab/modules/tclsci/Makefile.in
+++ b/scilab/modules/tclsci/Makefile.in
@@ -1510,6 +1510,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/texmacs/Makefile.in b/scilab/modules/texmacs/Makefile.in
index 74f2ee2..3b01202 100644
--- a/scilab/modules/texmacs/Makefile.in
+++ b/scilab/modules/texmacs/Makefile.in
@@ -814,6 +814,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/time/Makefile.in b/scilab/modules/time/Makefile.in
index 5d88d1a..2be5acd 100644
--- a/scilab/modules/time/Makefile.in
+++ b/scilab/modules/time/Makefile.in
@@ -1132,6 +1132,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/umfpack/Makefile.in b/scilab/modules/umfpack/Makefile.in
index f6605d5..1aa530d 100644
--- a/scilab/modules/umfpack/Makefile.in
+++ b/scilab/modules/umfpack/Makefile.in
@@ -1211,6 +1211,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/windows_tools/Makefile.in b/scilab/modules/windows_tools/Makefile.in
index 54783d0..9961ee4 100644
--- a/scilab/modules/windows_tools/Makefile.in
+++ b/scilab/modules/windows_tools/Makefile.in
@@ -1015,6 +1015,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/xcos/Makefile.in b/scilab/modules/xcos/Makefile.in
index d903ab6..a567ce2 100644
--- a/scilab/modules/xcos/Makefile.in
+++ b/scilab/modules/xcos/Makefile.in
@@ -1540,6 +1540,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/xpad/Makefile.in b/scilab/modules/xpad/Makefile.in
index 82d7fb9..c40a6c1 100644
--- a/scilab/modules/xpad/Makefile.in
+++ b/scilab/modules/xpad/Makefile.in
@@ -1177,6 +1177,7 @@ install-data-local:
                 if test -d $(srcdir)/$$dir/; then \
                         FILELIST="$(srcdir)/$$dir/$(MACROMASK) $(srcdir)/$$dir/$(MACROBINMASK) $(srcdir)/$$dir/$(MACROBUILDMASK) $(srcdir)/$$dir/names $(srcdir)/$$dir/lib";\
                         if test -n "$(MACROSSPECIALEXT)"; then \
+                                specialExtDir=""; \
                                 for specialExt in $(MACROSSPECIALEXT); do \
                                         specialExtDir="$$specialExtDir $(srcdir)/$$dir/$$specialExt"; \
                                 done; \
diff --git a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/XpadGUI.java b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/XpadGUI.java
index 41ea4b1..1c1d5e6 100644
--- a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/XpadGUI.java
+++ b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/XpadGUI.java
@@ -423,7 +423,7 @@ public class XpadGUI {
                                 }
                         }
                 };
-                menuItem = new JMenuItem(Messages.gettext("Execute selection into Scilab"));
+                menuItem = new JMenuItem(XpadMessages.EVALUATE_SELECTION);
                 menuItem.addActionListener(actionListenerExecuteIntoScilab);
                 if (!ScilabConsole.isExistingConsole()) { /* Only available in STD mode */
                         menuItem.setEnabled(false);
diff --git a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/LoadIntoScilabAction.java b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/LoadIntoScilabAction.java
index dae3431..1f0e434 100644
--- a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/LoadIntoScilabAction.java
+++ b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/actions/LoadIntoScilabAction.java
@@ -26,6 +26,9 @@ import javax.swing.KeyStroke;
 import org.scilab.modules.action_binding.InterpreterManagement;
 import org.scilab.modules.gui.menuitem.MenuItem;
 import org.scilab.modules.gui.messagebox.ScilabModalDialog;
+import org.scilab.modules.gui.messagebox.ScilabModalDialog.AnswerOption;
+import org.scilab.modules.gui.messagebox.ScilabModalDialog.ButtonType;
+import org.scilab.modules.gui.messagebox.ScilabModalDialog.IconType;
 import org.scilab.modules.xpad.Xpad;
 import org.scilab.modules.xpad.utils.XpadMessages;
 
@@ -40,7 +43,6 @@ public final class LoadIntoScilabAction extends DefaultAction {
          * serialVersionUID
          */
         private static final long serialVersionUID = -5659317486404897280L;
-        
 
         /**
          * Constructor
@@ -55,32 +57,48 @@ public final class LoadIntoScilabAction extends DefaultAction {
          */
         public void doAction() {
                 boolean bDoExec = false;
+
                 String text = getEditor().getTextPane().getText();
-                
+
                 if (text.compareTo("") != 0) {
-                        String tmpFilename = "LOAD_INTO_SCILAB-" + UUID.randomUUID().toString() + ".sce";
-                        String tmpFullFilename = System.getenv("TMPDIR") + System.getProperty("file.separator") + tmpFilename;
-                        // save file as UTF-8
-                        File f = new File(tmpFullFilename);
-                        try {
-                                OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(f) , "UTF-8");
-                                out.write(text);
-                                out.flush();
-                                out.close();
-                                bDoExec = true;
-                        } catch (IOException e) {
-                                bDoExec = false;
-                        }
-                        
-                        if (bDoExec && f.exists()) {
-                                String cmdToExec = "exec('" + tmpFullFilename + "', 2)";
-                                InterpreterManagement.requestScilabExec(cmdToExec);
+                        boolean bContinue = false;
+
+                        if (maxLinesRecommandedDetected(text)) {
+                                if (ScilabModalDialog.show(Xpad.getEditor(), XpadMessages.BIG_FILE_WARNING, XpadMessages.LOAD_INTO_SCILAB, 
+                                 IconType.QUESTION_ICON, ButtonType.YES_NO) == AnswerOption.YES_OPTION) {
+                                        bContinue = true;
+                                } else {
+                                        bContinue = false;
+                                }
                         } else {
-                                ScilabModalDialog.show(getEditor(), XpadMessages.COULD_NOT_FIND_TMPFILE);       
+                                bContinue = true;
+                        }
+
+                        if (bContinue) {
+                                String tmpFilename = "LOAD_INTO_SCILAB-" + UUID.randomUUID().toString() + ".sce";
+                                String tmpFullFilename = System.getenv("TMPDIR") + System.getProperty("file.separator") + tmpFilename;
+                                // save file as UTF-8
+                                File f = new File(tmpFullFilename);
+                                try {
+                                        OutputStreamWriter out = new OutputStreamWriter(new FileOutputStream(f) , "UTF-8");
+                                        out.write(text);
+                                        out.flush();
+                                        out.close();
+                                        bDoExec = true;
+                                } catch (IOException e) {
+                                        bDoExec = false;
+                                }
+
+                                if (bDoExec && f.exists()) {
+                                        String cmdToExec = "exec('" + tmpFullFilename + "', 1)";
+                                        InterpreterManagement.requestScilabExec(cmdToExec);
+                                } else {
+                                        ScilabModalDialog.show(getEditor(), XpadMessages.COULD_NOT_FIND_TMPFILE);
+                                }
                         }
                 }
         }
-        
+
         /**
          * createMenu
          * @param editor Xpad
@@ -91,4 +109,25 @@ public final class LoadIntoScilabAction extends DefaultAction {
                                 new LoadIntoScilabAction(editor), 
                                 KeyStroke.getKeyStroke(KeyEvent.VK_L, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()));
          }
+
+         /**
+          * check if string is not too big
+          * @param[in] text to scan
+          * @return true or false
+          */
+        private static boolean maxLinesRecommandedDetected(String text) {
+                int MAX_LINES_RECOMMANDED = 100;
+                int NB_STANDARD_COLUMNS = 80;
+                int MAX_CHARACTERS_RECOMMANDED = MAX_LINES_RECOMMANDED * NB_STANDARD_COLUMNS;
+                if (text.length() > MAX_CHARACTERS_RECOMMANDED) {
+                        return true;
+                }
+
+                String splitedStringOnLineSeparator[] = text.split(System.getProperty("line.separator"));
+                if (splitedStringOnLineSeparator.length > MAX_LINES_RECOMMANDED) {
+                        return true;
+                }
+
+                return false;
+        }
 }
diff --git a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/utils/XpadMessages.java b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/utils/XpadMessages.java
index 60bf6ee..3763c21 100644
--- a/scilab/modules/xpad/src/java/org/scilab/modules/xpad/utils/XpadMessages.java
+++ b/scilab/modules/xpad/src/java/org/scilab/modules/xpad/utils/XpadMessages.java
@@ -139,7 +139,7 @@ public class XpadMessages {
     public static final String NEXT_TAB = Messages.gettext("Next tab");
     public static final String PREVIOUS_TAB = Messages.gettext("Previous tab");
     public static final String EXECUTE_WARNING = Messages.gettext("You need to save your modifications before executing this file into Scilab.");
-    
+    public static final String BIG_FILE_WARNING = Messages.gettext("This file is very long. \"Execute File Into Scilab\" could be better.\nAre you sure to continue ?");
 
 
     public static final String ENTER_LINE_NUMBER = Messages .gettext("Enter line number");
@@ -148,8 +148,8 @@ public class XpadMessages {
     /* Status bar messages */
     public static final String LOADING = Messages .gettext("Loading") + DOTS;
     public static final String COLORIZATION_CANCELED = Messages .gettext("Colorization canceled");
-    
-    
+
+
     /* About box */
     public static final String VERSION = Messages.gettext("Editor") + " 1.0";
     public static final String DIGITEO = "The Scilab Consortium (DIGITEO)";
diff --git a/scilab/modules/xpad/tests/nonreg_tests/bug_5140.tst b/scilab/modules/xpad/tests/nonreg_tests/bug_5140.tst
index 0716d47..e4a3c5b 100644
--- a/scilab/modules/xpad/tests/nonreg_tests/bug_5140.tst
+++ b/scilab/modules/xpad/tests/nonreg_tests/bug_5140.tst
@@ -34,19 +34,23 @@ disp(A)
 
 //-->editor
   
+-->1+1
  ans  =
  
     2.  
- 
+-->2
  ans  =
  
     2.  
- 
+-->A= 3
  A  =
  
     3.  
- 
+-->disp(A)
  
     3.  
- 
 
+
+// creates a file with more 100 lines or more than 80 * 100 characters
+// do "Load into Scilab" 
+// a message box should be opened , try 'yes' and 'no'