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

2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9a5229fa503..551ef51d2e5 100644
--- 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 724afcc275e..a533bdb75e3 100644
--- 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