Renamed <file>-fontlock to <file>-syntax

1 files changed, 3 insertions, 3 deletions

diff --git a/proof.el b/proof.el
index 7522d8fc..802078ae 100644
--- a/proof.el
+++ b/proof.el
@@ -16,7 +16,7 @@
 (cond ((fboundp 'make-extent) (require 'span-extent))
       ((fboundp 'make-overlay) (require 'span-overlay))
       (t nil))
-(require 'proof-fontlock)
+(require 'proof-syntax)
 (require 'proof-indent)
 (require 'easymenu)
 
@@ -803,7 +803,8 @@
    ((string-match proof-shell-interrupt-regexp string)
     'interrupt)
 
-   ((string-match proof-shell-abort-goal-regexp string)
+   ((and proof-shell-abort-goal-regexp
+	 (string-match proof-shell-abort-goal-regexp string))
     (setq proof-shell-delayed-output (cons 'insert "\n\nAborted"))
     ())
 	 
@@ -835,7 +836,6 @@
     (funcall (cdr proof-shell-process-output-system-specific)
 	     cmd string))
 
-
    (t (setq proof-shell-delayed-output (cons 'insert string)))))
          
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;