--- hnf-mode.el.orig	Fri May 25 14:53:31 2001
+++ hnf-mode.el	Fri May 25 14:52:45 2001
@@ -356,8 +356,14 @@
 (defmacro hnf-command-need-close-p (command)
   (` (assq 'need-close (cdr (, command)))))
 
-(defvar hnf-font-lock-keywords
-  (let ((commands hnf-commands-table)
+
+(defvar hnf-font-lock-keywords nil
+  "Expressions to highlight in hnf mode.
+This value is generated by `hnf-commands-table'.")
+
+(defun hnf-font-lock-keywords-creation ()
+(setq hnf-font-lock-keywords
+	(let ((commands hnf-commands-table)
 	command type face ret1 ret2 ret3)
     (while (setq command (car commands))
       (if (setq face (hnf-command-get-face command))
@@ -398,8 +404,7 @@
 			       "\\)\\>")
 		       '(0 (if (hnf-header-p) hnf-variable-face)))))
 	    (list (cons "~$" hnf-tilde-face))))
-  "Expressions to highlight in hnf mode.
-This value is generated by `hnf-commands-table'.")
+	))
 
 (defvar hnf-outline-regexp
   (let ((commands hnf-commands-table)
@@ -458,6 +463,7 @@
   ;; font-lock
   (when hnf-font-lock-flag
     (require 'font-lock)
+    (hnf-font-lock-keywords-creation)
     (make-local-variable 'font-lock-defaults)
     (setq font-lock-defaults '(hnf-font-lock-keywords t))
     (font-lock-mode t))