fixed minor bugs

2 files changed, 7 insertions, 8 deletions

diff --git a/generic/proof-shell.el b/generic/proof-shell.el
index f21dec99..39c6208f 100644
--- a/generic/proof-shell.el
+++ b/generic/proof-shell.el
@@ -970,7 +970,12 @@ Annotations are characters 128-255."
 
 (defun proof-font-lock-minor-mode ()
   "Start font-lock as a minor mode in the current buffer."
-  (and (fboundp 'font-lock-set-defaults) (font-lock-set-defaults)))
+
+  ;; setting font-lock-defaults explicitly is required by FSF Emacs
+  ;; 20.2's version of font-lock
+  (make-local-variable 'font-lock-defaults)
+  (setq font-lock-defaults '(font-lock-keywords))
+  (font-lock-set-defaults))
 
 (defun proof-goals-config-done ()
   "Initialise the goals buffer after the child has been configured."
diff --git a/generic/proof.el b/generic/proof.el
index 4239e250..7247e7c6 100644
--- a/generic/proof.el
+++ b/generic/proof.el
@@ -30,12 +30,6 @@
 (require 'cl)				
 
 
-;; FIXME da: I think these should all be autoloaded!!
-;; (require 'compile)
-;; (require 'comint)
-;; (require 'etags)			
-;; (require 'easymenu)
-
 ;; browse-url function doesn't seem to be autoloaded in
 ;; XEmacs 20.4, but it is in FSF Emacs 20.2.
 (or (fboundp 'browse-url)
@@ -145,7 +139,7 @@ The argument KBL is a list of tuples (k . f) where `k' is a keybinding
       (setq start (goto-char (point-max)))
       (insert str) (setq end (point))
       (newline)
-      ;; FIXME tms: Make this work for FSF Emacs 20.2
+      (font-lock-set-defaults)		;required for FSF Emacs 20.2
       (font-lock-fontify-region start end)
       (font-lock-append-text-property start end 'face face)
       (buffer-substring start end))))