summaryrefslogtreecommitdiffstats
path: root/scilab/modules/shell
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-03-16 15:19:56 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-03-16 15:19:56 +0100
commitdd80edde2b9fdba5eea8fef2d73d0bc9d4b97661 (patch)
tree782dd57d6fd73a61b1147aa306dcd0863919c13b /scilab/modules/shell
parent0040387579b11cf982e2fbd59c05751a28971f47 (diff)
parentfcf094440a0507cc049d1be4444ff9a81b0af748 (diff)
downloadscilab-dd80edde2b9fdba5eea8fef2d73d0bc9d4b97661.zip
scilab-dd80edde2b9fdba5eea8fef2d73d0bc9d4b97661.tar.gz
Merge remote branch 'origin/5.2'
Diffstat (limited to 'scilab/modules/shell')
-rw-r--r--scilab/modules/shell/src/c/others/mainscic.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/scilab/modules/shell/src/c/others/mainscic.c b/scilab/modules/shell/src/c/others/mainscic.c
index 4dc9279..754d51c 100644
--- a/scilab/modules/shell/src/c/others/mainscic.c
+++ b/scilab/modules/shell/src/c/others/mainscic.c
@@ -85,7 +85,7 @@ fpsetmask(0);
85 { 85 {
86 setScilabMode(SCILAB_NW); 86 setScilabMode(SCILAB_NW);
87 } 87 }
88 else if ( strcmp(argv[i],"-nwni") == 0) 88 else if ( strcmp(argv[i],"-nwni") == 0 || strcmp(argv[i],"-nogui") == 0)
89 { 89 {
90 setScilabMode(SCILAB_NWNI); 90 setScilabMode(SCILAB_NWNI);
91 } 91 }
@@ -125,11 +125,10 @@ fpsetmask(0);
125 setScilabMode(SCILAB_NW); 125 setScilabMode(SCILAB_NW);
126 settexmacs(); 126 settexmacs();
127 } 127 }
128 else if ( strcmp(argv[i],"-nogui") == 0) 128 else if ( strcmp(argv[i],"-version") == 0) {
129 { 129 disp_scilab_version();
130 setScilabMode(SCILAB_NWNI); 130 exit(1);
131 } 131 }
132 else if ( strcmp(argv[i],"-version") == 0) {disp_scilab_version();exit(1);}
133 } 132 }
134 133
135 134