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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bef5f1ba71fd0c52f016dd2456874020461f20a1..9b21fd8cd6684a5905be30acdd19946e349a6352 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2014-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * electric.el (electric-indent-functions-without-reindent): Add yaml.
+
        * minibuffer.el (completion-table-with-quoting) <completion--unquote>:
        Make sure the new point we return is within the new string (bug#17239).
 

diff --git a/lisp/electric.el b/lisp/electric.el
index 52b0595f7d91434fa300fe19b7f89437d5667bc6..e8ceaa6406c9e356ef67335e86e346bc6bfb8f1a 100644 (file)
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -221,7 +221,8 @@ 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 yaml-indent-line
-    haskell-indentation-indent-line haskell-indent-cycle haskell-simple-indent)
+    haskell-indentation-indent-line haskell-indent-cycle haskell-simple-indent
+    yaml-indent-line)
   "List of indent functions that can't reindent.
 If `line-indent-function' is one of those, then `electric-indent-mode' will
 not try to reindent lines.  It is normally better to make the major