[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master b90909050d: Merge from origin/emacs-28
From: |
Stefan Kangas |
Subject: |
master b90909050d: Merge from origin/emacs-28 |
Date: |
Sun, 15 May 2022 00:52:28 -0400 (EDT) |
branch: master
commit b90909050d4d7b1f1a8d291c0da874748e79ef06
Merge: 2a5e1d8c44 8370caa835
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Merge from origin/emacs-28
8370caa835 ; * lisp/electric.el (electric-indent-mode): Clarify doc (...
---
lisp/electric.el | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/lisp/electric.el b/lisp/electric.el
index 905d4a87c7..322792757f 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -310,10 +310,16 @@ column specified by the function `current-left-margin'."
;;;###autoload
(define-minor-mode electric-indent-mode
- "Toggle on-the-fly reindentation (Electric Indent mode).
+ "Toggle on-the-fly reindentation of text lines (Electric Indent mode).
When enabled, this reindents whenever the hook `electric-indent-functions'
-returns non-nil, or if you insert a character from `electric-indent-chars'.
+returns non-nil, or if you insert one of the \"electric characters\".
+The electric characters normally include the newline, but can
+also include other characters as needed by the major mode; see
+`electric-indent-chars' for the actual list.
+
+By \"reindent\" we mean remove any existing indentation, and then
+indent the line accordiung to context and rules of the major mode.
This is a global minor mode. To toggle the mode in a single buffer,
use `electric-indent-local-mode'."