[Emacs-diffs] Changes to emacs/lisp/progmodes/idlw-help.el,v

[John-David T. Smith]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     John-David T. Smith <jdsmith>   07/03/08 18:30:57

Index: idlw-help.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/idlw-help.el,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- idlw-help.el        21 Jan 2007 03:20:45 -0000      1.18
+++ idlw-help.el        8 Mar 2007 18:30:57 -0000       1.19
@@ -386,8 +386,7 @@
                           (< 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 @@
        (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 @@
 ;; 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.")