=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/ctrl.c,v retrieving revision 1.24 retrieving revision 1.26 diff -u -p -r1.24 -r1.26 --- OpenXM_contrib2/asir2000/builtin/ctrl.c 2003/10/20 09:17:52 1.24 +++ OpenXM_contrib2/asir2000/builtin/ctrl.c 2003/10/21 04:28:48 1.26 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/builtin/ctrl.c,v 1.23 2003/10/19 02:54:41 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/ctrl.c,v 1.25 2003/10/20 09:20:14 noro Exp $ */ #include "ca.h" #include "parse.h" @@ -147,18 +147,21 @@ Q *rp; } else if ( !strcmp(key,"prompt") ) { /* special treatment is necessary for "prompt" */ if ( argc(arg) == 1 ) { - *rp = (Q)user_defined_prompt; + if ((!do_quiet) && (user_defined_prompt == (Obj)0)) *rp=ONE; + else *rp = (Q)user_defined_prompt; } else { c = (Q)ARG1(arg); - if ( !c || OID(c) == O_STR ) { - if ( OID(c) == O_STR ) { - str = BDY((STRING)c); - for ( i = 0, n = 0; str[i]; i++ ) - if ( str[i] == '%' ) - n++; - if ( n >= 2 ) - error("ctrl : prompt : invalid prompt specification"); - } + if ( !c ) { + do_quiet = 1; + user_defined_prompt = 0; + *rp = 0; + } else if ( OID(c) == O_STR ) { + str = BDY((STRING)c); + for ( i = 0, n = 0; str[i]; i++ ) + if ( str[i] == '%' ) + n++; + if ( n >= 2 ) + error("ctrl : prompt : invalid prompt specification"); do_quiet = 1; user_defined_prompt = (Obj)c; *rp = c;