--- gforth/gforth.el	1998/05/13 16:47:23	1.30
+++ gforth/gforth.el	1999/10/15 23:18:20	1.35
@@ -1,10 +1,8 @@
 ;; Forth mode for Emacs
-;; This file is part of GForth.
-;; Changes by anton
-;; This is a variant of forth.el that came with TILE.
-;; I left most of this stuff untouched and made just a few changes for 
-;; the things I use (mainly indentation and syntax tables).
-;; So there is still a lot of work to do to adapt this to gforth.
+
+;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+
+;; This file is part of Gforth.
 
 ;; GForth is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY.  No author or distributor
@@ -21,6 +19,12 @@
 ;; file named COPYING.  Among other things, the copyright notice
 ;; and this notice must be preserved on all copies.
 
+;; Changes by anton
+;; This is a variant of forth.el that came with TILE.
+;; I left most of this stuff untouched and made just a few changes for 
+;; the things I use (mainly indentation and syntax tables).
+;; So there is still a lot of work to do to adapt this to gforth.
+
 ;;-------------------------------------------------------------------
 ;; A Forth indentation, documentation search and interaction library
 ;;-------------------------------------------------------------------
@@ -36,20 +40,20 @@
 
 
 (defvar forth-positives
-  " : :noname code interpretation: ;code does> begin do ?do +do -do u+do u-do while if ?dup-if ?dup-0=-if else case of struct [if] [ifdef] [ifundef] [else] with public: private: class "
-  "Contains all words which will cause the indent-level to be incremented
+  " : :noname m: :m code interpretation: ;code does> begin do ?do +do -do u+do u-do while if ?dup-if ?dup-0=-if else case of struct [if] [ifdef] [ifundef] [else] with public: private: class "
+  "*Contains all words which will cause the indent-level to be incremented
 on the next line.
 OBS! All words in forth-positives must be surrounded by spaces.")
 
 (defvar forth-negatives
-  " ; end-code ;code does> until repeat while +loop loop -loop s+loop else then endif again endcase endof end-struct [then] [else] [endif] endwith class; how: "
-  "Contains all words which will cause the indent-level to be decremented
+  " ; ;m end-code ;code does> until repeat while +loop loop -loop s+loop else then endif again endcase endof end-struct [then] [else] [endif] endwith end-class class; how: "
+  "*Contains all words which will cause the indent-level to be decremented
 on the current line.
 OBS! All words in forth-negatives must be surrounded by spaces.")
 
 (defvar forth-zeroes
   " : :noname code interpretation: public: private: how: implements class class; "
-  "Contains all words which causes the indent to go to zero")
+  "*Contains all words which causes the indent to go to zero")
 
 (setq forth-zero 0)
 
@@ -88,6 +92,16 @@ OBS! All words in forth-negatives must b
 (define-key forth-mode-map "\M-q" 'forth-fill-paragraph)
 (define-key forth-mode-map "\e." 'forth-find-tag)
 
+;setup for C-h C-i to work
+(if (fboundp 'info-lookup-add-help)
+    (info-lookup-add-help
+     :topic 'symbol
+     :mode 'forth-mode
+     :regexp "[^ 	
+]+"
+     :ignore-case t
+     :doc-spec '(("(gforth)Name Index" nil "`" "'  "))))
+
 (load "etags")
 
 (defun forth-find-tag (tagname &optional next-p regexp-p)