--- gforth/gforth.el	2007/02/22 19:37:06	1.72
+++ gforth/gforth.el	2007/12/31 17:34:58	1.74
@@ -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 Free Software Foundation, Inc.
 
 ;; This file is part of Gforth.
 
@@ -61,13 +61,13 @@
       (progn (string-match "^[0-9]+" emacs-version)
 	     (string-to-int (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)