--- gforth/gforth.el	2002/01/19 17:43:28	1.58
+++ gforth/gforth.el	2002/02/04 21:25:17	1.60
@@ -33,6 +33,7 @@
 ;; Changes by David
 ;; Added a syntax-hilighting engine, rewrote auto-indentation engine.
 ;; Added support for block files.
+;; Tested with Emacs 19.34, 20.5, 21.1 and XEmacs 21.1
  
 ;;-------------------------------------------------------------------
 ;; A Forth indentation, documentation search and interaction library
@@ -49,7 +50,7 @@
 
 ;;; Code:
 
-(setq debug-on-error t)
+;(setq debug-on-error t)
 
 ;; Code ripped from `version.el' for compatability with Emacs versions
 ;; prior to 19.23.
@@ -90,9 +91,16 @@
   (set-face-foreground font-lock-warning-face "red")
   (make-face-bold font-lock-warning-face))
 
+;; define `font-lock-constant-face' in XEmacs (just copy
+;; `font-lock-preprocessor-face')
+(unless (boundp 'font-lock-constant-face)
+  (copy-face font-lock-preprocessor-face 'font-lock-constant-face)
+  (defvar font-lock-constant-face 'font-lock-comment-face))
+
 ;; define `regexp-opt' in emacs versions prior to 20.1 
 ;; (this implementation is extremely inefficient, though)
-(unless (boundp 'regexp-opt)
+(eval-and-compile (forth-require 'regexp-opt))
+(unless (memq 'regexp-opt features)
   (message (concat 
 	    "Warning: your Emacs version doesn't support `regexp-opt'. "
             "Hilighting will be slow."))
@@ -102,7 +110,6 @@
   (defun regexp-opt-depth (re)
     (if (string= (substring re 0 2) "\\(") 1 0)))
 
-  
 ; todo:
 ;
 
@@ -226,7 +233,8 @@ PARSED-TYPE specifies what kind of text
 	(("[ifdef]" "[ifundef]") immediate (font-lock-keyword-face . 2)
 	 "[ \t\n]" t name (font-lock-function-name-face . 3))
 	(("if" "begin" "ahead" "do" "?do" "+do" "u+do" "-do" "u-do" "for" 
-	  "case" "of" "?dup-if" "?dup-0=-if" "then" "until" "repeat" "again" 
+	  "case" "of" "?dup-if" "?dup-0=-if" "then" "endif" "until"
+	  "repeat" "again"
 	  "loop" "+loop" "-loop" "next" "endcase" "endof" "else" "while" "try"
 	  "recover" "endtry" "assert(" "assert0(" "assert1(" "assert2(" 
 	  "assert3(" ")" "<interpretation" "<compilation" "interpretation>" 
@@ -376,7 +384,7 @@ INDENT1 and INDENT2 are indentation spec
 	 (0 . 2) (0 . 2) non-immediate)
 	("\\S-+%$" (0 . 2) (0 . 0) non-immediate)
 	((";" ";m") (-2 . 0) (0 . -2))
-	(("again" "repeat" "then" "endtry" "endcase" "endof" 
+	(("again" "repeat" "then" "endif" "endtry" "endcase" "endof" 
 	  "[then]" "[endif]" "[loop]" "[+loop]" "[next]" 
 	  "[until]" "[repeat]" "[again]" "loop")
 	 (-2 . 0) (0 . -2))
@@ -432,11 +440,14 @@ End:\" construct).")
 ;; Helper function for `forth-compile-word': translate one entry from 
 ;; `forth-words' into the form  (regexp regexp-depth word-description)
 (defun forth-compile-words-mapper (word)
+  ;; warning: we cannot rely on regexp-opt's PAREN argument, since
+  ;; XEmacs will use shy parens by default :-(
   (let* ((matcher (car word))
-	 (regexp (if (stringp matcher) (concat "\\(" matcher "\\)")
-		   (if (listp matcher) (regexp-opt matcher t)
-		     (error "Invalid matcher (stringp or listp expected `%s'" 
-			    matcher))))
+	 (regexp 
+	  (concat "\\(" (cond ((stringp matcher) matcher)
+			      ((listp matcher) (regexp-opt matcher))
+			      (t (error "Invalid matcher `%s'")))
+		  "\\)"))
 	 (depth (regexp-opt-depth regexp))
 	 (description (cdr word)))
     (list regexp depth description)))
@@ -542,7 +553,8 @@ End:\" construct).")
 ;; expression that matched. (used for identifying branches "a\\|b\\|c...")
 (defun forth-get-regexp-branch ()
   (let ((count 2))
-    (while (not (match-beginning count))
+    (while (not (condition-case err (match-beginning count)
+		  (args-out-of-range t)))  ; XEmacs requires error handling
       (setq count (1+ count)))
     count))
 
@@ -1059,13 +1071,20 @@ exceeds 64 characters."
 ;setup for C-h C-i to work
 (eval-and-compile (forth-require 'info-look))
 (when (memq 'info-look features)
-  (info-lookup-add-help
-   :topic 'symbol
-   :mode 'forth-mode
-   :regexp "[^ 	
-]+"
-   :ignore-case t
-   :doc-spec '(("(gforth)Name Index" nil "`" "'  "))))
+  ;; info-lookup-add-help not supported in XEmacs :-(
+  (defvar forth-info-lookup '(symbol (forth-mode "\\w+" t 
+						  (("(gforth)Word Index"))
+						  "\\w+")))
+  (unless (memq forth-info-lookup info-lookup-alist)
+    (setq info-lookup-alist (cons forth-info-lookup info-lookup-alist))))
+
+;;   (info-lookup-add-help
+;;    :topic 'symbol
+;;    :mode 'forth-mode
+;;    :regexp "[^ 	
+;; ]+"
+;;    :ignore-case t
+;;    :doc-spec '(("(gforth)Name Index" nil "`" "'  "))))
 
 (require 'etags)