aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2018-05-15 09:09:48 -0700
committerGlenn Morris2018-05-15 09:09:48 -0700
commit3cc714d1024c3e51a7dd996678d07dbf73de2306 (patch)
treeabb3004fd140483c279d4e6574582cca91b1526e
parent8f088e1513719d810febbf0754ab27c8243c2a1b (diff)
parentc2ef847d3ca45ac4c15a99d7eea462932d9cc9f4 (diff)
downloademacs-3cc714d1024c3e51a7dd996678d07dbf73de2306.tar.gz
emacs-3cc714d1024c3e51a7dd996678d07dbf73de2306.zip
Merge from origin/emacs-26
c2ef847 (origin/emacs-26) Clarify the mode-line indicators in CC Mode
-rw-r--r--doc/emacs/programs.texi4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 49d1b9d2b11..c72558ce9a7 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -1662,7 +1662,9 @@ chaotically indented code. If you are new to CC Mode, you might find
1662it disconcerting. You can toggle electric action with the command 1662it disconcerting. You can toggle electric action with the command
1663@kbd{C-c C-l}; when it is enabled, @samp{/@var{c}l} appears in the 1663@kbd{C-c C-l}; when it is enabled, @samp{/@var{c}l} appears in the
1664mode line after the mode name (where @var{c}, if present, is @samp{*} 1664mode line after the mode name (where @var{c}, if present, is @samp{*}
1665or @samp{/}): 1665or @samp{/}, depending on whether the comment style is block or line).
1666@xref{Minor Modes,,, ccmode, The CC Mode Manual}, for more about
1667mode-line indicators in CC Mode.
1666 1668
1667@table @kbd 1669@table @kbd
1668@item C-c C-l 1670@item C-c C-l