summaryrefslogtreecommitdiffstats
path: root/scilab/modules/shell
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-01-11 15:26:45 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-01-11 15:26:45 +0100
commit4f92431e9a0f2316852a37de6eb908c98db003cc (patch)
tree0ec2f530a1ccc8046a20c46c8c8b03461d46f3ce /scilab/modules/shell
parent775017f69c380e8c8346caace6066c4490846a3b (diff)
parent76c5a4a015da39c88f5b97fd72d9e502ce4e69b4 (diff)
downloadscilab-4f92431e9a0f2316852a37de6eb908c98db003cc.zip
scilab-4f92431e9a0f2316852a37de6eb908c98db003cc.tar.gz
Merge branch '5.2' of git.scilab.org:scilab into 5.2
Diffstat (limited to 'scilab/modules/shell')
-rw-r--r--scilab/modules/shell/src/c/prompt.c29
1 files changed, 18 insertions, 11 deletions
diff --git a/scilab/modules/shell/src/c/prompt.c b/scilab/modules/shell/src/c/prompt.c
index 4b98093..0dad38f 100644
--- a/scilab/modules/shell/src/c/prompt.c
+++ b/scilab/modules/shell/src/c/prompt.c
@@ -1,14 +1,15 @@
1/* 1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 2* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) INRIA 3* Copyright (C) INRIA
4 * 4* Copyright (C) DIGITEO - 2010
5 * This file must be used under the terms of the CeCILL. 5*
6 * This source file is licensed as described in the file COPYING, which 6* This file must be used under the terms of the CeCILL.
7 * you should have received as part of this distribution. The terms 7* This source file is licensed as described in the file COPYING, which
8 * are also available at 8* you should have received as part of this distribution. The terms
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 9* are also available at
10 * 10* http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
11 */ 11*
12*/
12#include <stdio.h> 13#include <stdio.h>
13#include <string.h> 14#include <string.h>
14#include "prompt.h" 15#include "prompt.h"
@@ -44,10 +45,16 @@ void C2F(setprlev)( int *pause)
44 } 45 }
45 } 46 }
46 sprintf(Sci_Prompt,SCIPROMPT_INTERRUPT,*pause); 47 sprintf(Sci_Prompt,SCIPROMPT_INTERRUPT,*pause);
48 // bug 5513
49 // when we change prompt to a pause level, we change also temp. prompt
50 SetTemporaryPrompt(Sci_Prompt);
47 } 51 }
48 else 52 else
49 { 53 {
50 sprintf(Sci_Prompt,SCIPROMPT_PAUSE); 54 sprintf(Sci_Prompt,SCIPROMPT_PAUSE);
55 // bug 5513
56 // when we change prompt to halt level, we change also temp. prompt
57 SetTemporaryPrompt(Sci_Prompt);
51 } 58 }
52} 59}
53/*------------------------------------------------------------------------*/ 60/*------------------------------------------------------------------------*/
@@ -71,7 +78,7 @@ void SetTemporaryPrompt(char *tempPrompt)
71/*------------------------------------------------------------------------*/ 78/*------------------------------------------------------------------------*/
72char *GetTemporaryPrompt(void) 79char *GetTemporaryPrompt(void)
73{ 80{
74 return temporaryPrompt; 81 return temporaryPrompt;
75} 82}
76/*------------------------------------------------------------------------*/ 83/*------------------------------------------------------------------------*/
77void ClearTemporaryPrompt(void) 84void ClearTemporaryPrompt(void)