diff options
| author | Pierre Courtieu | 2018-12-14 15:44:32 +0100 |
|---|---|---|
| committer | Pierre Courtieu | 2018-12-14 15:44:32 +0100 |
| commit | ed4ffd4a653ae792aefeacbb0daa967fd4cb2524 (patch) | |
| tree | 60a407c7f8ee7f2eb7a0dfd21230f47b1295d6b1 /hol-light | |
| parent | bfcb1a442b225394edc5e61ff8b3216e8f0efe83 (diff) | |
| parent | 632a3d7f9ded16faaf58e1c0769bcd4f7c8193e3 (diff) | |
Merge branch 'master' of github.com:ProofGeneral/PG
Diffstat (limited to 'hol-light')
| -rw-r--r-- | hol-light/hol-light-autotest.el | 5 | ||||
| -rw-r--r-- | hol-light/hol-light.el | 10 |
2 files changed, 5 insertions, 10 deletions
diff --git a/hol-light/hol-light-autotest.el b/hol-light/hol-light-autotest.el index d68b898f..dab2c4c4 100644 --- a/hol-light/hol-light-autotest.el +++ b/hol-light/hol-light-autotest.el @@ -3,7 +3,7 @@ ;; This file is part of Proof General. ;; Portions © Copyright 1994-2012 David Aspinall and University of Edinburgh -;; Portions © Copyright 2003, 2012, 2014 Free Software Foundation, Inc. +;; Portions © Copyright 2003, 2012, 2014, 2018 Free Software Foundation, Inc. ;; Portions © Copyright 2001-2017 Pierre Courtieu ;; Portions © Copyright 2010, 2016 Erik Martin-Dorel ;; Portions © Copyright 2011-2013, 2016-2017 Hendrik Tews @@ -16,9 +16,6 @@ ;;; Code: -(eval-when-compile - (require 'cl)) - (require 'proof-site) (proof-ready-for-assistant 'hol-light) diff --git a/hol-light/hol-light.el b/hol-light/hol-light.el index 2b4f3989..808e04a9 100644 --- a/hol-light/hol-light.el +++ b/hol-light/hol-light.el @@ -3,7 +3,7 @@ ;; This file is part of Proof General. ;; Portions © Copyright 1994-2012 David Aspinall and University of Edinburgh -;; Portions © Copyright 2003, 2012, 2014 Free Software Foundation, Inc. +;; Portions © Copyright 2003-2018 Free Software Foundation, Inc. ;; Portions © Copyright 2001-2017 Pierre Courtieu ;; Portions © Copyright 2010, 2016 Erik Martin-Dorel ;; Portions © Copyright 2011-2013, 2016-2017 Hendrik Tews @@ -22,12 +22,10 @@ (require 'proof-easy-config) ; easy configure mechanism (require 'proof-syntax) ; functions for making regexps -(or (proof-try-require 'caml-font) ; use OCaml Emacs mode syntax - (defvar caml-font-lock-keywords nil)) ; +(proof-try-require 'caml-font) ; use OCaml Emacs mode syntax (eval-when-compile - (require 'proof-tree) - (defvar caml-font-lock-keywords nil)) + (require 'proof-tree)) (defcustom hol-light-home (or (getenv "HOLLIGHT_HOME") @@ -317,7 +315,7 @@ You need to restart Emacs if you change this setting." proof-script-font-lock-keywords (append - caml-font-lock-keywords + (bound-and-true-p caml-font-lock-keywords) (list (cons (proof-ids-to-regexp hol-light-keywords) 'font-lock-keyword-face) (cons (proof-ids-to-regexp hol-light-tactics) 'proof-tactics-name-face) |