Changeset bea8e49 in git

Timestamp:

Sep 1, 1999, 12:54:07 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f8ad9acc5479672026b7a6fe7f32e24d634827ba

Parents:

9ad3531983eb9d194f4cca3befe7a3e381f64992

Message:

* small changes in Display of help


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

File:

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

Singular/fehelp.cc

@@ -644 +644 @@
   {
     Warn("Displaying help in browser '%s'.", heCurrentHelpBrowser->browser);
-    Warn("Use 'system(\"--browser\", \"<browser>\");' to change browser");
-    Warn("Use 'system(\"browsers\");'               for available browsers");
-    feHelpCalled = TRUE;
-  }
+    Warn("Use 'system(\"--browser\", <browser>);' to change browser");
+    char* browsers = StringSetS("where <browser> can be: ");
+    int i = 0;
+    i = 0;
+    while (heHelpBrowsers[i].browser != NULL)
+    {
+      if (heHelpBrowsers[i].init_proc(0))
+        StringAppend("\"%s\", ", heHelpBrowsers[i].browser);
+      i++;
+    }
+    if (browsers[strlen(browsers)-2] == ',')
+    {
+      browsers[strlen(browsers)-2] = '.';
+      browsers[strlen(browsers)-1] = '\0';
+    }
+    WarnS(browsers);
+  }
+    
   heCurrentHelpBrowser->help_proc(hentry);
+  feHelpCalled = TRUE;
 }
 
@@ -741 +756 @@
     sprintf(sys, "%s %s &", feResource('N' /*"netscape"*/), url);
     system(sys);
+  }
+  else
+  {
+    if (! feHelpCalled)
+    {
+      Warn("Help is displayed in already running 'netscape'.");
+    }
   }
 }