--- gforth/gforth.el	1999/10/15 23:18:20	1.35
+++ gforth/gforth.el	2000/10/01 11:20:05	1.44
@@ -1,6 +1,6 @@
 ;; Forth mode for Emacs
 
-;; Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
 
 ;; This file is part of Gforth.
 
@@ -40,13 +40,13 @@
 
 
 (defvar forth-positives
-  " : :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 "
+  " : :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 try recover "
   "*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
-  " ; ;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: "
+  " ; ;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: recover endtry "
   "*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.")
@@ -160,8 +160,8 @@ OBS! All words in forth-negatives must b
   (setq comment-column 40)
   (make-local-variable 'comment-start-skip)
   (setq comment-start-skip "\\ ")
-  (make-local-variable 'comment-indent-hook)
-  (setq comment-indent-hook 'forth-comment-indent)
+  (make-local-hook 'comment-indent-hook)
+  (add-hook comment-indent-hook 'forth-comment-indent)
   (make-local-variable 'parse-sexp-ignore-comments)
   (setq parse-sexp-ignore-comments t))
   
@@ -241,7 +241,7 @@ Variables controling documentation searc
 ;      (run-forth forth-program-name))
   (run-hooks 'forth-mode-hook))
 
-(setq forth-mode-hook
+(add-hook 'forth-mode-hook
       '(lambda () 
 	 (make-local-variable 'compile-command)
 	 (setq compile-command "gforth ")))
@@ -990,5 +990,28 @@ The region is sent terminated by a newli
 ;       (define-key global-map '(shift button3) 'mouse-function-menu)
 ))
 
+;;; Highlighting
+
+(if (not (file-exists-p "/usr/share/emacs/site-lisp/hl319.el"))
+    (require 'hilit19)
+  (require 'hl319))
+
+(hilit-set-mode-patterns
+ '(forth-mode)
+ (append
+  '(("\\\\ \\(.*\\)$" nil comment)) ; comments
+  '(("\\\\[gG] \\(.*\\)$" nil comment)) ; comments
+  '(("(\\( [^)\n]* \\| \\)--\\( [^)\n]* \\| \\))" nil decl))
+  '(("( " ")" comment))
+  '(("\" [^\"\n]*\"" nil string))
+  '(("\\(\\[IF]\\|\\[IFDEF]\\|\\[IFUNDEF]\\|\\[ELSE]\\|\\[THEN]\\|IF\\|ELSE\\|THEN\\|CASE\\|ENDCASE\\|OF\\|ENDOF\\|BEGIN\\|WHILE\\|REPEAT\\|UNTIL\\|AGAIN\\|DOES>\\|?DO\\|DO\\|\+LOOP\\|UNLOOP\\|LOOP\\|EXIT\\)" nil keyword))
+  '(("\\(\\[if]\\|\\[ifdef]\\|\\[ifundef]\\|\\[else]\\|\\[then]\\|if\\|else\\|then\\|case\\|endcase\\|of\\|endof\\|begin\\|while\\|repeat\\|until\\|again\\|does>\\|?do\\|do\\|\+loop\\|unloop\\|loop\\|exit\\)" nil keyword))
+  '((": *[^ \n]*" nil defun))
+  '(("Defer *[^ \n]*" nil defun))
+  '(("\\(Variable\\|Constant\\|Value\\|Create\\) *[^ \n]*" nil define))
+  '(("\\(include\\|require\\) *[^ \n]*" nil include))
+  '(("[\n 	]\\(\\$[0-9A-Fa-f]+[\n 	]\\|&[0-9]+[\n 	]\\|[0-9]+[\n 	]\\|%[01]+[\n 	]\\|'[^ \n]+\\)+" nil formula))
+  '((":noname" nil defun))))
+
 ;; end