--- gforth/gforth.el	2004/12/31 13:23:57	1.71
+++ gforth/gforth.el	2010/08/20 20:17:28	1.79
@@ -1,6 +1,6 @@
 ;;; gforth.el --- major mode for editing (G)Forth sources
 
-;; Copyright (C) 1995,1996,1997,1998,2000,2001,2003,2004 Free Software Foundation, Inc.
+;; Copyright (C) 1995,1996,1997,1998,2000,2001,2003,2004,2007,2008 Free Software Foundation, Inc.
 
 ;; This file is part of Gforth.
 
@@ -59,15 +59,15 @@
 (if (not (boundp 'emacs-major-version))
     (defconst emacs-major-version
       (progn (string-match "^[0-9]+" emacs-version)
-	     (string-to-int (match-string 0 emacs-version)))))
+	     (string-to-number (match-string 0 emacs-version)))))
 
+;; Code ripped from `subr.el' for compatability with Emacs versions
+;; prior to 20.1
+(eval-when-compile 
 (defun forth-emacs-older (major minor)
   (or (< emacs-major-version major)
       (and (= emacs-major-version major) (< emacs-minor-version minor))))
 
-;; Code ripped from `subr.el' for compatability with Emacs versions
-;; prior to 20.1
-(eval-when-compile 
   (if (forth-emacs-older 20 1)
       (progn
 	(defmacro when (cond &rest body)
@@ -79,8 +79,9 @@
 
 ;; `no-error' argument of require not supported in Emacs versions
 ;; prior to 20.4 :-(
+(eval-and-compile
 (defun forth-require (feature)
-  (condition-case err (require feature) (error nil)))
+    (condition-case err (require feature) (error nil))))
 
 (require 'font-lock)
 
@@ -240,12 +241,17 @@ PARSED-TYPE specifies what kind of text
 	 immediate (font-lock-keyword-face . 1))
 	(("does>") compile-only (font-lock-keyword-face . 1))
 	((":noname") definition-starter (font-lock-keyword-face . 1))
-	((";" ";code") definition-ender (font-lock-keyword-face . 1))
+	((";" ";code" ";abi-code") definition-ender (font-lock-keyword-face . 1))
 	(("include" "require" "needs" "use") 
 	 non-immediate (font-lock-keyword-face . 1) 
 	 "[\n\t ]" t string (font-lock-string-face . 1))
 	(("included" "required" "thru" "load")
 	 non-immediate (font-lock-keyword-face . 1))
+	(("code" "abi-code")
+	 non-immediate (font-lock-keyword-face . 1)
+	 "[ \t\n]" t name (font-lock-function-name-face . 3))
+	(("end-code")
+	 non-immediate (font-lock-keyword-face . 1))
 	(("[char]") compile-only (font-lock-keyword-face . 1)
 	 "[ \t\n]" t string (font-lock-string-face . 1))
 	(("char") non-immediate (font-lock-keyword-face . 1)
@@ -273,7 +279,8 @@ PARSED-TYPE specifies what kind of text
 	  "case" "of" "?dup-if" "?dup-0=-if" "then" "endif" "until"
 	  "repeat" "again" "leave" "?leave"
 	  "loop" "+loop" "-loop" "next" "endcase" "endof" "else" "while" "try"
-	  "recover" "endtry" "assert(" "assert0(" "assert1(" "assert2(" 
+	  "recover" "endtry" "iferror" "restore" "endtry-iferror"
+	  "assert(" "assert0(" "assert1(" "assert2("
 	  "assert3(" ")" "<interpretation" "<compilation" "interpretation>" 
 	  "compilation>")
 	 compile-only (font-lock-keyword-face . 2))
@@ -311,6 +318,8 @@ PARSED-TYPE specifies what kind of text
 	(("struct") non-immediate (font-lock-keyword-face . 2))
 	("-?[0-9]+\\(\\.[0-9]*e\\(-?[0-9]+\\)?\\|\\.?[0-9a-f]*\\)" 
 	 immediate (font-lock-constant-face . 3))
+	("-?\\([&#][0-9]+\\|\\(0x\\|\\$\\)[0-9a-f]+\\|%[01]+\\)"
+	 immediate (font-lock-constant-face . 3))
 	))
 
 (defvar forth-use-objects nil 
@@ -415,10 +424,11 @@ INDENT1 and INDENT2 are indentation spec
 
 (setq forth-indent-words
       '((("if" "begin" "do" "?do" "+do" "-do" "u+do"
-	  "u-do" "?dup-if" "?dup-0=-if" "case" "of" "try" 
+	  "u-do" "?dup-if" "?dup-0=-if" "case" "of" "try" "iferror"
 	  "[if]" "[ifdef]" "[ifundef]" "[begin]" "[for]" "[do]" "[?do]")
 	 (0 . 2) (0 . 2))
-	((":" ":noname" "code" "struct" "m:" ":m" "class" "interface")
+	((":" ":noname" "code" "abi-code" "struct" "m:" ":m" "class" 
+	  "interface")
 	 (0 . 2) (0 . 2) non-immediate)
 	("\\S-+%$" (0 . 2) (0 . 0) non-immediate)
 	((";" ";m") (-2 . 0) (0 . -2))
@@ -431,8 +441,9 @@ INDENT1 and INDENT2 are indentation spec
 	 (-2 . 0) (0 . -2) non-immediate)
 	(("protected" "public" "how:") (-1 . 1) (0 . 0) non-immediate)
 	(("+loop" "-loop" "until") (-2 . 0) (-2 . 0))
-	(("else" "recover" "[else]") (-2 . 2) (0 . 0))
-	(("does>") (-1 . 1) (0 . 0))
+	(("else" "recover" "restore" "endtry-iferror" "[else]")
+	 (-2 . 2) (0 . 0))
+	(("does>" ";code" ";abi-code") (-1 . 1) (0 . 0))
 	(("while" "[while]") (-2 . 4) (0 . 2))
 	(("repeat" "[repeat]") (-4 . 0) (0 . -4))))
 
@@ -459,12 +470,11 @@ End:\" construct).")
 ;; in Lisp??
 (defun forth-filter (predicate list)
   (let ((filtered nil))
-    (mapcar (lambda (item)
+    (dolist (item list)
 	      (when (funcall predicate item)
 		(if filtered
 		    (nconc filtered (list item))
-		  (setq filtered (cons item nil))))
-	      nil) list)
+          (setq filtered (cons item nil)))))
     filtered))
 
 ;; Helper function for `forth-compile-word': return whether word has to be
@@ -485,7 +495,7 @@ End:\" construct).")
 	 (regexp 
 	  (concat "\\(" (cond ((stringp matcher) matcher)
 			      ((listp matcher) (regexp-opt matcher))
-			      (t (error "Invalid matcher `%s'")))
+			      (t (error "Invalid matcher")))
 		  "\\)"))
 	 (depth (regexp-opt-depth regexp))
 	 (description (cdr word)))
@@ -527,6 +537,8 @@ End:\" construct).")
   "Parse and bind local variables, set in the contents of the current 
  forth-mode buffer. Prepend `forth-local-words' to `forth-words' and 
  `forth-local-indent-words' to `forth-indent-words'."
+  (put 'forth-local-indent-words 'safe-local-variable 'listp)
+  (put 'forth-local-words 'safe-local-variable 'listp)
   (hack-local-variables)
   (setq forth-words (append forth-local-words forth-words))
   (setq forth-indent-words (append forth-local-indent-words 
@@ -696,14 +708,14 @@ End:\" construct).")
 (eval-when-compile 
   (defmacro forth-save-buffer-state (varlist &rest body)
     "Bind variables according to VARLIST and eval BODY restoring buffer state."
-    (` (let* ((,@ (append varlist
+    `(let* (,@(append varlist
 		   '((modified (buffer-modified-p)) (buffer-undo-list t)
 		     (inhibit-read-only t) (inhibit-point-motion-hooks t)
 		     before-change-functions after-change-functions
-		     deactivate-mark buffer-file-name buffer-file-truename))))
-	 (,@ body)
+                        deactivate-mark buffer-file-name buffer-file-truename)))
+       ,@body
 	 (when (and (not modified) (buffer-modified-p))
-	   (set-buffer-modified-p nil))))))
+         (set-buffer-modified-p nil)))))
 
 ;; Function that is added to the `change-functions' hook. Calls 
 ;; `forth-update-properties' and keeps care of disabling undo information
@@ -1382,18 +1394,12 @@ programmers who tend to fill code won't
       (progn
 	(delete-other-windows)
 	(split-window-vertically
-	 (/ (* (screen-height) forth-percent-height) 100))
+	 (/ (frame-height) 2))
 	(other-window 1)
 	(switch-to-buffer buffer)
 	(goto-char (point-max))
 	(other-window 1))))
 
-(defun forth-compile (command)
-  (interactive (list (setq forth-compile-command (read-string "Compile command: " forth-compile-command))))
-  (forth-split-1 "*compilation*")
-  (setq ctools-compile-command command)
-  (compile1 ctools-compile-command "No more errors"))
-
 ;;; Forth menu
 ;;; Mikael Karlsson <qramika@eras70.ericsson.se>
 
@@ -1613,8 +1619,7 @@ of `forth-program-name').  Runs the hook
 	(forth-end-of-paragraph)
 	(skip-chars-backward  "\t\n ")
 	(setq end (point))
-	(if (re-search-backward "\n[ \t]*\n" nil t)
-	    (setq start (point))
+	(if (null (re-search-backward "\n[ \t]*\n" nil t))
 	  (goto-char (point-min)))
 	(skip-chars-forward  "\t\n ")
 	(forth-send-region (point) end))))
@@ -1652,11 +1657,11 @@ With argument, position cursor at end of
 	   (push-mark)
 	   (goto-char (point-max)))))
 
-  (defun forth-send-region-and-go (start end)
+  (defun forth-send-region-and-go (my-start end)
     "Send the current region to the inferior Forth process.
 Then switch to the process buffer."
     (interactive "r")
-    (forth-send-region start end)
+    (forth-send-region my-start end)
     (forth-switch-to-interactive t))
 
   (defcustom forth-source-modes '(forth-mode forth-block-mode)