diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-05-05 15:04:40 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-05-05 15:04:40 -0400 |
| commit | e6025d7240197bfd47cf649c5976533da6869a6e (patch) | |
| tree | 0b0f617b349651f217bcbf2004718e10863cdb63 | |
| parent | 879e36286d46283ac4b3e794c502bfac4c33016d (diff) | |
| download | emacs-e6025d7240197bfd47cf649c5976533da6869a6e.tar.gz | |
* lisp/electric.el (electric-indent-functions-without-reindent): Add yaml.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/electric.el | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bef5f1ba71f..9b21fd8cd66 100644 --- 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 52b0595f7d9..e8ceaa6406c 100644 --- 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 |