diff options
| author | Daniel Colascione <dancol@dancol.org> | 2014-01-05 19:58:59 -0800 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2014-01-05 19:58:59 -0800 |
| commit | b82ace2f23dd390d743935f7ae8486cf9daadcac (patch) | |
| tree | 4be7e85f8af411fc000f9bd2d95a7bb800773541 /lisp | |
| parent | d1e12aefa680dced77cd2b1c93a9a818a8bf0160 (diff) | |
| download | emacs-b82ace2f23dd390d743935f7ae8486cf9daadcac.tar.gz emacs-b82ace2f23dd390d743935f7ae8486cf9daadcac.tar.bz2 emacs-b82ace2f23dd390d743935f7ae8486cf9daadcac.zip | |
rst-mode indentation is non-deterministic, so inhibit electric indentation
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/textmodes/rst.el | 5 |
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 |