diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-11-20 13:08:35 -0500 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-11-20 13:08:35 -0500 |
| commit | 33bfbfee7ef04392b0c30ca2ab5074a14c4ddad7 (patch) | |
| tree | 1f9432682a7bff627f7208bcd8cc594bf7b5d60a /lisp/electric.el | |
| parent | 7cf41d8088284c2fe8b1807d07fc082a270e6a78 (diff) | |
| parent | 6e6bf60eab1e921605064e3d39ea080639f8e0f6 (diff) | |
| download | emacs-33bfbfee7ef04392b0c30ca2ab5074a14c4ddad7.tar.gz | |
Merge from origin/emacs-26
6e6bf60 Don't let delete_frame select a tooltip frame (Bug#27647)
e9dd580 Filter obtrusive events in help-read-key-sequence.
90075e8 Fix symlink flag in tramp-gvfs-handle-file-attributes
c355529 Fix bug in tramp-handle-file-truename
4c21d04 Fix a typo in doc string of electric-indent-functions-without...
319c2de Avoid assertion violations in echo_area_display
63c7733 ; * lisp/ido.el (ido-find-alternate-file): Doc fix. (Bug#29278)
cbd319a Fix case-folding in Occur
29520b0 Fix quick-calc in C mode with hex values
3e80124 Improve documentation of dired-next/prev-marked-file
90add18 Prevent aborts in line-move-visual
648c128 More fixes in src/.gdbinit
104f3e5 Document how to enter whitespace when using grep-read-files
Diffstat (limited to 'lisp/electric.el')
| -rw-r--r-- | lisp/electric.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/electric.el b/lisp/electric.el index 5f4304462dd..cee35621397 100644 --- a/lisp/electric.el +++ b/lisp/electric.el @@ -227,7 +227,7 @@ Python does not lend itself to fully automatic indentation.") 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 +If `indent-line-function' is one of those, then `electric-indent-mode' will not try to reindent lines. It is normally better to make the major mode set `electric-indent-inhibit', but this can be used as a workaround.") |