Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm/src
Modified Files:
command.c
Log Message:
Wed Jan 7 15:08:24 2004 Michael Jennings (mej)
Disable build-time check for screen.
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/command.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -3 -r1.98 -r1.99
--- command.c 24 Aug 2003 15:09:32 -0000 1.98
+++ command.c 7 Jan 2004 20:08:42 -0000 1.99
@@ -34,7 +34,7 @@
* he guarantee anything whatsoever.
*----------------------------------------------------------------------*/
-static const char cvs_ident[] = "$Id: command.c,v 1.98 2003/08/24 15:09:32 mej Exp $";
+static const char cvs_ident[] = "$Id: command.c,v 1.99 2004/01/07 20:08:42 mej Exp $";
/* includes: */
#include "config.h"
@@ -2916,6 +2916,7 @@
int ns_err;
_ns_efuns *efuns;
buttonbar_t *bbar;
+ spif_uchar_t old_pause = (BITFIELD_IS_SET(eterm_options, ETERM_OPTIONS_PAUSE) ?
(1) : (0));
if (TermWin.screen_mode == NS_MODE_NONE) {
return run_command(argv);
@@ -2939,6 +2940,7 @@
bbar_add(bbar);
}
+ BITFIELD_SET(eterm_options, ETERM_OPTIONS_PAUSE);
if ((TermWin.screen = ns_attach_by_URL(rs_url, rs_hop, &efuns, &ns_err, bbar)) ==
NULL) {
D_CMD(("ns_attach_by_URL(%s,%s) failed\n", rs_url, rs_hop));
return -1;
@@ -2946,6 +2948,9 @@
if (rs_delay >= 0) {
TermWin.screen->delay = rs_delay; /* more flexible ways later */
}
+ if (!old_pause) {
+ BITFIELD_CLEAR(eterm_options, ETERM_OPTIONS_PAUSE);
+ }
make_escreen_menu(bbar);
@@ -3002,7 +3007,8 @@
}
if ((cmd_fd = command_func(argv)) < 0) {
print_error("Unable to run sub-command.\n");
- exit(EXIT_FAILURE);
+ paused = 1;
+ rs_finished_text = "Hit a key to exit...";
}
}
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
