(idlwave-do-context-help1): Don't visit special help topics for

keywords.
(idlwave-help-assistant-command): Include ".exe" for ms-dos
etc. Assistant command.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16fd7348e3bd00a6e71f196f3f3b19c138f97774..e683efb937ac32b126324956c955fea00afb9c5c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-08  J.D. Smith  <jdsmith@as.arizona.edu>
+
+       * progmodes/idlw-help.el (idlwave-do-context-help1): Don't visit
+       special help topics for keywords.
+       (idlwave-help-assistant-command): Include ".exe" for ms-dos
+       etc. Assistant command.
+
 2007-03-08  Chong Yidong  <cyd@stupidchicken.com>
 
        * replace.el (occur-engine): buffer-undo-list binding moved...

diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index a9ceccac6a0a810ce866f9bef59eba3f87a860c6..030b785acdf589a58935778ea677fed90b4f1de4 100644 (file)
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -386,8 +386,7 @@ It collects and prints the diagnostics messages."
                           (< beg (- end 4))))
           module keyword cw mod1 mod2 mod3)
       (if (or arg 
-             (and (not st-ass)
-                  (not classtag)
+             (and (not classtag)
                   (not structtag)
                   (not (member (string-to-char this-word) '(?! ?.)))))
          ;; Need the module information
@@ -408,7 +407,8 @@ It collects and prints the diagnostics messages."
        (arg (setq mod1 module))
        
        ;; A special topic -- only system help
-       (st-ass (setq mod1 (list (cdr st-ass))))
+       ((and st-ass (not (memq cw '(function-keyword procedure-keyword))))
+       (setq mod1 (list (cdr st-ass))))
        
        ;; A system variable -- only system help
        ((string-match 
@@ -1226,7 +1226,7 @@ Useful when source code is displayed as help.  See the option
 ;; we must pass the -profile argument as well.
 (defvar idlwave-help-assistant-command 
   (if (memq system-type '(ms-dos windows-nt))
-      "bin/bin.x86/idl_assistant"
+      "bin/bin.x86/idl_assistant.exe"
     "bin/idl_assistant")
   "The command, rooted at idlwave-system-directory, which invokes the
 IDL assistant.")