rst-mode indentation is non-deterministic, so inhibit electric indentation

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a5229fa5036aada711385f15d1324b2c64ef199..551ef51d2e57f0d4824f886c7f29992894411199 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-06  Daniel Colascione  <dancol@dancol.org>
+
+       * textmodes/rst.el (rst-mode): Set electric-indent-inhibit for
+       rst-mode.
+
 2014-01-05  Martin Rudalics  <rudalics@gmx.at>
 
        * window.el (balance-windows): Add mising t to fix Bug#16351.

diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el
index 724afcc275e4c56284a7aee735f714c0f6e88d44..a533bdb75e3fc0aeddf2bfdfafc6a0b5c5a635e0 100644 (file)
--- a/lisp/textmodes/rst.el
+++ b/lisp/textmodes/rst.el
@@ -864,7 +864,10 @@ highlighting.
   (add-hook 'font-lock-extend-region-functions 'rst-font-lock-extend-region t)
 
   ;; Text after a changed line may need new fontification.
-  (set (make-local-variable 'jit-lock-contextually) t))
+  (set (make-local-variable 'jit-lock-contextually) t)
+
+  ;; Indentation is not deterministic.
+  (setq electric-indent-inhibit t))
 
 ;;;###autoload
 (define-minor-mode rst-minor-mode