[Emacs-diffs] master 3cc714d 3/3: Merge from origin/emacs-26

[Glenn Morris]

branch: master
commit 3cc714d1024c3e51a7dd996678d07dbf73de2306
Merge: 8f088e1 c2ef847
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Merge from origin/emacs-26
    
    c2ef847 (origin/emacs-26) Clarify the mode-line indicators in CC Mode
---
 doc/emacs/programs.texi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index 49d1b9d..c72558c 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
 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).
address@hidden Modes,,, ccmode, The CC Mode Manual}, for more about
+mode-line indicators in CC Mode.
 
 @table @kbd
 @item C-c C-l