Merge from origin/emacs-26

c2ef847 (origin/emacs-26) Clarify the mode-line indicators in CC Mode
This commit is contained in:
Glenn Morris 2018-05-15 09:09:48 -07:00
commit 3cc714d102

View file

@ -1662,7 +1662,9 @@ chaotically indented code. If you are new to CC Mode, you might find
it disconcerting. You can toggle electric action with the command
@kbd{C-c C-l}; when it is enabled, @samp{/@var{c}l} appears in the
mode line after the mode name (where @var{c}, if present, is @samp{*}
or @samp{/}):
or @samp{/}, depending on whether the comment style is block or line).
@xref{Minor Modes,,, ccmode, The CC Mode Manual}, for more about
mode-line indicators in CC Mode.
@table @kbd
@item C-c C-l