Changeset c06a32 in git for Singular/fehelp.cc

Timestamp:

Sep 20, 1999, 8:03:51 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

70883173be34d0af981d9af508ccbb1e77912676

Parents:

aef7ccb547c93eee9ab75ef2c46ce9149f6dd9ca

Message:

* New Handling of Command-line options


git-svn-id: file:///usr/local/Singular/svn/trunk@3623 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/fehelp.cc (modified) (9 diffs)

Singular/fehelp.cc

@@ -21 +21 @@
 #include "ipshell.h"
 #include "libparse.h"
+#include "feOpt.h"
 
 /*****************************************************************
@@ -149 +150 @@
         Warn("No help for topic '%s' (not even for '*%s*')", str, str);
         WarnS("Try '?;'       for general help");
-        WarnS("or  '?Index;'  for all available help topics");
+        WarnS("or  '?Index;'  for all available help topics.");
         return;
       }
@@ -182 +183 @@
 {
   int i = 0;
-  extern void mainSetSingOptionValue(const char* name, char* value);
-  char* mainGetSingOptionValue(const char* name);
-
-  // if no argument, see what we have as value to the option
-  if (which == NULL || *which == '\0')
-    which = mainGetSingOptionValue("browser");
 
   // if no argument, choose first available help browser
   if (which == NULL || *which == '\0')
   {
-    // unles one is already set
-    if (heCurrentHelpBrowser != NULL) goto Finish;
-
+    // return, if already set
+    if (heCurrentHelpBrowser != NULL) 
+      return heCurrentHelpBrowser->browser;
+
+    // First, try emacs, if emacs-option is set
+    if (feOptValue(FE_OPT_EMACS) != NULL)
+    {
+      while (heHelpBrowsers[i].browser != NULL)
+      {
+        if (strcmp(heHelpBrowsers[i].browser, "emacs") == 0 &&
+            (heHelpBrowsers[i].init_proc(0)))
+        {
+          heCurrentHelpBrowser = &(heHelpBrowsers[i]);
+          goto Finish;
+        }
+        i++;
+      }
+      i=0;
+    }
     while (heHelpBrowsers[i].browser != NULL)
     {
@@ -200 +211 @@
       {
         heCurrentHelpBrowser = &(heHelpBrowsers[i]);
-        return heCurrentHelpBrowser->browser;
+        goto Finish;
       }
       i++;
@@ -215 +226 @@
   if (heHelpBrowsers[i].browser == NULL)
   {
-    if (warn) Warn("No help browser '%s' available", which);
+    if (warn) Warn("No help browser '%s' available.", which);
   }
   else
@@ -230 +241 @@
   if (heCurrentHelpBrowser == NULL)
   {
-    // choose first available help browser
-    mainSetSingOptionValue("browser", "");
     feHelpBrowser();
     assume(heCurrentHelpBrowser != NULL);
     if (warn)
-      Warn("Setting help browser to '%s'", heCurrentHelpBrowser->browser);
+      Warn("Setting help browser to '%s'.", heCurrentHelpBrowser->browser);
     return heCurrentHelpBrowser->browser;
   }
@@ -242 +251 @@
     // or, leave as is
     if (warn)
-      Warn("Help browser stays at '%s'",  heCurrentHelpBrowser->browser);
+      Warn("Help browser stays at '%s'.",  heCurrentHelpBrowser->browser);
+    return heCurrentHelpBrowser->browser;
   }
 
   Finish:
-  mainSetSingOptionValue("browser", heCurrentHelpBrowser->browser);
+  // update value of Browser Option
+  if (feOptSpec[FE_OPT_BROWSER].value == NULL ||
+      strcmp((char*) feOptSpec[FE_OPT_BROWSER].value,  
+             heCurrentHelpBrowser->browser) != 0)
+  {
+    if (feOptSpec[FE_OPT_BROWSER].value == NULL) 
+      FreeL(feOptSpec[FE_OPT_BROWSER].value);
+   feOptSpec[FE_OPT_BROWSER].value 
+     = (void*) mstrdup(heCurrentHelpBrowser->browser);
+  }
   return heCurrentHelpBrowser->browser;
 }
@@ -642 +661 @@
     return;
 
-  if (heCurrentHelpBrowser == NULL) feHelpBrowser();
+  if (heCurrentHelpBrowser == NULL) feHelpBrowser(NULL, 0);
   assume(heCurrentHelpBrowser != NULL);
   if (! feHelpCalled)
@@ -722 +741 @@
   {
     if (warn) WarnS("no local HtmlDir found");
-    if (warn) Warn("using %s instead", feResource('u' /*"ManualUrl"*/, warn));
+    return FALSE;
+//    if (warn) Warn("using %s instead", feResource('u' /*"ManualUrl"*/, warn));
   }
   return TRUE;