aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/sman/sman.c13
2 files changed, 5 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index b2222e46..e1899476 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-30 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * sman/sman.c (should_I_clef): Remove.
+
2009-09-29 Gabriel Dos Reis <gdr@cs.tamu.edu>
* sman/sman.c (fix_env): Simplify.
diff --git a/src/sman/sman.c b/src/sman/sman.c
index 0dcbcbbb..b4d73dd8 100644
--- a/src/sman/sman.c
+++ b/src/sman/sman.c
@@ -58,7 +58,6 @@
#include "utils.h"
static void process_arguments(openaxiom_command*, int, char**);
-static int should_I_clef(void);
static int in_X(void);
static void set_up_defaults(void);
static void process_options(openaxiom_command*, int, char**);
@@ -93,7 +92,6 @@ static void monitor_children(void);
/* System defined pointer to array or environment variables. */
extern char** environ;
-char *ws_path; /* location of the core executable */
int start_clef; /* start clef under spad */
int start_graphics; /* start the viewman */
int start_ht; /* start hypertex */
@@ -188,8 +186,6 @@ process_arguments(openaxiom_command* command, int argc,char ** argv)
start_local_spadclient = 0;
else if (strcmp(argv[arg], "-noiw") == 0)
start_spadclient = 0;
- else if (strcmp(argv[arg], "-comp") == 0)
- ws_path = "$AXIOM/etc/images/comp";
else if (strcmp(argv[arg], "-nox") == 0
|| strcmp(argv[arg], "--no-gui") == 0) {
use_X = 0;
@@ -231,12 +227,6 @@ process_arguments(openaxiom_command* command, int argc,char ** argv)
}
}
-static int
-should_I_clef(void)
-{
- return(1);
-}
-
static int
in_X(void)
{
@@ -247,13 +237,12 @@ in_X(void)
static void
set_up_defaults(void)
{
- start_clef = should_I_clef();
+ start_clef = 1;
start_graphics = 1;
start_ht = 1;
start_spadclient = 0;
start_local_spadclient = 1;
use_X = isatty(0) && in_X();
- ws_path = "$AXIOM/bin/AXIOMsys";
}
static void