Merge branch 'master' of github.com:ProofGeneral/PG

2 files changed, 10 insertions, 1 deletions

diff --git a/coq/coq-db.el b/coq/coq-db.el
index dd9020d8..28f2ff2b 100644
--- a/coq/coq-db.el
+++ b/coq/coq-db.el
@@ -316,7 +316,7 @@ See `coq-syntax-db' for DB structure."
   :group 'proof-faces)
 
 (defface coq-symbol-face
-  '((t :inherit default-face :bold coq-bold-unicode-binders))
+  '((t :inherit font-lock-type-face :bold coq-bold-unicode-binders))
   "Face for unicode binders, by default a bold version of `font-lock-type-face'."
   :group 'proof-faces)
 
diff --git a/coq/coq-system.el b/coq/coq-system.el
index fff239c1..f3eabafc 100644
--- a/coq/coq-system.el
+++ b/coq/coq-system.el
@@ -33,6 +33,15 @@
   (defvar coq-prog-args)
   (defvar coq-debug))
 
+;; Arbitrary arguments can already be passed through _CoqProject.
+;; However this is not true for all assistants, so we don't modify the
+;; (defpgcustom prog-args) declaration.
+(defun coq--string-list-p (obj)
+  "Determine if OBJ is a list of strings."
+  (or (null obj) (and (consp obj) (stringp (car obj)) (coq--string-list-p (cdr obj)))))
+
+(put 'coq-prog-args 'safe-local-variable #'coq--string-list-p)
+
 (defcustom coq-prog-env nil
   "List of environment settings to pass to Coq process.
 On Windows you might need something like: