From 60db7ba0c5e5f7b773591f8b244d25f9ddbc5576 Mon Sep 17 00:00:00 2001
From: Pierre Courtieu
Date: Fri, 9 Jan 2015 10:32:22 +0000
Subject: Removing non-smie indentation + fix CHANGES.

---
 coq/coq.el | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'coq')

diff --git a/coq/coq.el b/coq/coq.el
index b3eaa903..9f4dc08e 100644
--- a/coq/coq.el
+++ b/coq/coq.el
@@ -1381,22 +1381,23 @@ Warning:
 	proof-nested-undo-regexp coq-state-changing-commands-regexp
         proof-script-imenu-generic-expression coq-generic-expression)
 
-  (if (fboundp 'smie-setup) ; always use smie, old indentation code removed
-      (progn
-        (smie-setup coq-smie-grammar #'coq-smie-rules
-                    :forward-token #'coq-smie-forward-token
-                    :backward-token #'coq-smie-backward-token))
-    (require 'coq-indent)
-    (setq
-     ;; indentation is implemented in coq-indent.el
-     indent-line-function 'coq-indent-line
-     proof-indent-any-regexp      coq-indent-any-regexp
-     proof-indent-open-regexp     coq-indent-open-regexp
-     proof-indent-close-regexp    coq-indent-close-regexp)
-
-    (make-local-variable 'indent-region-function)
-    (setq indent-region-function 'coq-indent-region))
-
+  (when (fboundp 'smie-setup) ; always use smie, old indentation code removed
+    (smie-setup coq-smie-grammar #'coq-smie-rules
+                  :forward-token #'coq-smie-forward-token
+                  :backward-token #'coq-smie-backward-token))
+
+  ;; old indentation code.
+  ;; (require 'coq-indent)
+  ;; (setq
+  ;;  ;; indentation is implemented in coq-indent.el
+  ;;  indent-line-function 'coq-indent-line
+  ;;  proof-indent-any-regexp      coq-indent-any-regexp
+  ;;  proof-indent-open-regexp     coq-indent-open-regexp
+  ;;  proof-indent-close-regexp    coq-indent-close-regexp)
+  ;; (make-local-variable 'indent-region-function)
+  ;; (setq indent-region-function 'coq-indent-region)
+  
+  
 
   ;; span menu
   (setq proof-script-span-context-menu-extensions 'coq-create-span-menu)
-- 
cgit v1.2.3