Changeset e6af18 in git

Timestamp:

Jul 23, 2013, 11:01:38 AM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

71a263848349882522f62f6c6369df2489d587d6

Parents:

f052a168e8609d4cc9eec8ff570e13cf79d60b7c

Message:

fix: help for dynamic modules/proc

mainly from master

File:

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

Singular/fehelp.cc

@@ -99 +99 @@
  *
  *****************************************************************/
-// order is improtant -- first possible help is choosen
+// order is important -- first possible help is chosen
 // moved to LIB/help.cnf
 static heBrowser_s *heHelpBrowsers=NULL;
@@ -117 +117 @@
 
   BOOLEAN key_is_regexp = (strchr(str, '*') != NULL);
+
+  // try proc help and library help
+  if (! key_is_regexp && heOnlineHelp(str)) return;
+
   heEntry_s hentry;
   memset(&hentry,0,sizeof(hentry));
@@ -127 +131 @@
     return;
   }
-
-  // try proc help and library help
-  if (! key_is_regexp && heOnlineHelp(str)) return;
 
   // Try to match approximately with key in index file
@@ -191 +192 @@
     char *matches=StringEndS();
     PrintS(matches);
+    omFree(matches);
     PrintLn();
-    omFree(matches);
     return;
   }
@@ -687 +688 @@
 static BOOLEAN heOnlineHelp(char* s)
 {
-  idhdl h=IDROOT->get(s,myynest);
   char *ss;
-
+  idhdl h;
+
+  if ((ss=strstr(s,"::"))!=NULL)
+  {
+    *ss='\0';
+    ss+=2;
+    h=ggetid(s);
+    if (h!=NULL)
+    {
+      Print("help for %s from package %s\n",ss,s);
+      char s_help[200];
+      strcpy(s_help,ss);
+      strcat(s_help,"_help");
+      idhdl hh=IDPACKAGE(h)->idroot->get(s_help,0);
+      hePrintHelpStr(hh,s_help,s);
+      return TRUE;
+    }
+    else Print("package %s not found\n",s);
+    return TRUE; /* do not search the manual */
+  }
+  h=IDROOT->get(s,myynest);
   // try help for a procedure
   if (h!=NULL)
@@ -707 +727 @@
         return TRUE;
       }
-      else
-      {
-        char s_help[200];
-        strcpy(s_help,s);
-        strcat(s_help,"_help");
-        idhdl hh=IDROOT->get(s_help,0);
-        hePrintHelpStr(hh,s_help,"Top");
-      }
     }
     else if (IDTYP(h)==PACKAGE_CMD)
@@ -720 +732 @@
       idhdl hh=IDPACKAGE(h)->idroot->get("info",0);
       hePrintHelpStr(hh,"info",s);
-    }
-    else if ((ss=strstr(s,"::"))!=NULL)
-    {
-      *ss='\0';
-      ss+=2;
-      h=ggetid(s);
-      if (h!=NULL)
-      {
-        Print("help for %s from package %s\n",ss,s);
-        char s_help[200];
-        strcpy(s_help,ss);
-        strcat(s_help,"_help");
-        idhdl hh=IDPACKAGE(h)->idroot->get(s_help,0);
-        hePrintHelpStr(hh,s_help,s);
-      }
-      else Print("package %s not found\n",s);
+      return TRUE;
     }
     return FALSE;
@@ -892 +889 @@
                if (feResource(*p, warn) == NULL)
                {
-                 if (warn) Warn("ressource `%c` not found",*p);
+                 if (warn) Warn("resource `%c` not found",*p);
                  return FALSE;
                }
@@ -899 +896 @@
                if (getenv("DISPLAY") == NULL)
                {
-                 if (warn) WarnS("ressource `D` not found");
+                 if (warn) WarnS("resource `D` not found");
                  return FALSE;
                }
@@ -984 +981 @@
 {
   char sys[MAX_SYSCMD_LEN];
-  // char url[MAXPATHLEN];
   const char *p=heHelpBrowsers[br].action;
   if (p==NULL) {PrintS("no action ?\n"); return;}
@@ -1067 +1063 @@
   }
   Print("running `%s`\n",sys);
-  /*int dummy=*/ (void) system(sys);
+  (void) system(sys);
 }