* lisp/electric.el (electric-indent-functions-without-reindent):

Add `yaml-indent-line'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ecc299063ae9b5d7a581079669cdab69d93b7a64..71bc7e48aef12cc55322f9f4735b5ca703fff40e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-21  Dmitry Gutov  <dgutov@yandex.ru>
+
+       * electric.el (electric-indent-functions-without-reindent):
+       Add `yaml-indent-line'.
+
 2014-02-21  Juanma Barranquero  <lekktu@gmail.com>
 
        * w32-vars.el (w32-enable-synthesized-fonts): Mark as obsolete.

diff --git a/lisp/electric.el b/lisp/electric.el
index 4549fcad83c6b00c8acd544722351df9e718709f..992553685e27631fb45fbece2af8e9d00bb32fb3 100644 (file)
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -220,7 +220,7 @@ Python does not lend itself to fully automatic indentation.")
 
 (defvar electric-indent-functions-without-reindent
   '(indent-relative indent-to-left-margin indent-relative-maybe
-    py-indent-line coffee-indent-line org-indent-line
+    py-indent-line coffee-indent-line org-indent-line yaml-indent-line
     haskell-indentation-indent-line haskell-indent-cycle haskell-simple-indent)
   "List of indent functions that can't reindent.
 If `line-indent-function' is one of those, then `electric-indent-mode' will