aboutsummaryrefslogtreecommitdiffhomepage
path: root/coq
diff options
context:
space:
mode:
authorGravatar David Aspinall <da@inf.ed.ac.uk>2011-07-26 10:54:42 +0000
committerGravatar David Aspinall <da@inf.ed.ac.uk>2011-07-26 10:54:42 +0000
commit91c02049244f1b6d83d03a39167a7df946346185 (patch)
tree41ea6a16c7dc7cf1a2e3127f1696a77eda2f1b1a /coq
parent7238c3d7555b01d814666e12ec24e87a1ed154c5 (diff)
Fix compile when smie isnt available
Diffstat (limited to 'coq')
-rw-r--r--coq/coq.el17
1 files changed, 11 insertions, 6 deletions
diff --git a/coq/coq.el b/coq/coq.el
index 6e6e7883..59fa3c5c 100644
--- a/coq/coq.el
+++ b/coq/coq.el
@@ -21,7 +21,8 @@
(require 'newcomment)
(require 'etags)
(unless (proof-try-require 'smie)
- (defvar smie-indent-basic nil)) ; smie
+ (defvar smie-indent-basic nil)
+ (defvar smie-rules-function nil)) ; smie
(defvar queueitems nil) ; dynamic scope in p-s-extend-queue-hook
(defvar coq-time-commands nil) ; defpacustom
@@ -30,11 +31,15 @@
(defvar coq-confirm-external-compilation nil) ; defpacustom
(proof-ready-for-assistant 'coq)) ; compile for coq
-;; (unless ; for smie indentation
-;; (proof-try-require 'smie)
-;; can't get conditional declaration to work here
- (declare-function smie-bnf->prec2 "smie")
- (declare-function smie-rule-parent-p "smie")
+
+;; FIXME: making these declarations conditional doesn't work
+(declare-function smie-bnf->prec2 "smie")
+(declare-function smie-rule-parent-p "smie")
+(declare-function smie-default-forward-token "smie")
+(declare-function smie-default-backward-token "smie")
+(declare-function smie-rule-prev-p "smie")
+(declare-function smie-rule-separator "smie")
+(declare-function smie-rule-parent "smie")
(require 'proof)
(require 'coq-syntax) ; sets coq-prog-name