aboutsummaryrefslogtreecommitdiffhomepage
path: root/coq/coq-syntax.el
diff options
context:
space:
mode:
authorGravatar Pierre Courtieu <Pierre.Courtieu@cnam.fr>2015-10-06 10:59:56 +0200
committerGravatar Pierre Courtieu <Pierre.Courtieu@cnam.fr>2015-10-06 11:21:49 +0200
commitc1b8d71101c7615ff30b9e9a1e43dff7ad0245ae (patch)
tree3427360bf7fc8fe045b6b91d8365853824adcef3 /coq/coq-syntax.el
parent9e394174695f002cd55419ba0db21e44b1270ddf (diff)
Trying to deal with debug mode.
Diffstat (limited to 'coq/coq-syntax.el')
-rw-r--r--coq/coq-syntax.el14
1 files changed, 10 insertions, 4 deletions
diff --git a/coq/coq-syntax.el b/coq/coq-syntax.el
index 7f518615..7317eae6 100644
--- a/coq/coq-syntax.el
+++ b/coq/coq-syntax.el
@@ -1079,6 +1079,14 @@ It is used:
;; Remove spurious variable and function faces on commas.
'(proof-zap-commas))))
+
+;; ", " is for multiple hypothesis diplayed in v8.5. If more than
+;; 1 space this is a hypothesis displayed in the middle of a line (> v8.5)
+;; "^ " is for goals in debug mode.
+(defvar coq-hyp-name-in-goal-or-response-regexp
+ "\\(^\\|^ \\|^ \\|[^^ ] ? \\)\\(\\(?:[^\n :(),=]\\|, \\|,$\\)+ *\\(?:: \\|,$\\)\\)"
+ "regexp matching hypothesis names in goal or response buffer")
+
;; We define a slightly different set of keywords for response buffer.
(defvar coq-response-font-lock-keywords
@@ -1092,9 +1100,7 @@ It is used:
(cons (proof-regexp-alt-list-symb (list "In environment" "The term" "has type")) 'proof-error-face)
(cons (proof-regexp-alt-list-symb (list "Set" "Type" "Prop")) 'font-lock-type-face)
(list (concat "[?]" coq-id) 0 'proof-eager-annotation-face);; highlight evars
- ;; ", " is for multiple hypothesis diplayed in v8.5. If more than
- ;; 1 space this is a hypothesis displayed in the middle of a line (> v8.5)
- (cons "\\(^\\| \\) \\{0,1,2\\}\\([^\n :(),]\\|, \\)+ *:" 'proof-declaration-name-face)
+ (list coq-hyp-name-in-goal-or-response-regexp 2 'proof-declaration-name-face)
(list "^\\([^ \n]+\\) \\(is defined\\)" (list 1 'font-lock-function-name-face t)))))
(defvar coq-goals-font-lock-keywords
@@ -1103,7 +1109,7 @@ It is used:
(list
(cons coq-reserved-regexp 'font-lock-type-face)
(list (concat "[?]" coq-id) 0 'proof-eager-annotation-face);; highlight evars
- (cons "\\(^\\| \\) \\{0,2\\}\\([^ \n:()=]\\|, \\)+ *:" 'proof-declaration-name-face)
+ (list coq-hyp-name-in-goal-or-response-regexp 2 'proof-declaration-name-face)
(cons (proof-regexp-alt-list-symb (list "Set" "Type" "Prop")) 'font-lock-type-face))))