aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/cc-mode.texi2
2 files changed, 5 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index c5810dc4a3f..589f0060840 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
12014-01-25 Xue Fuqiao <xfq.free@gmail.com>
2
3 * cc-mode.texi (Minor Modes): Minor fix.
4
12014-01-24 David Engster <deng@randomsample.de> 52014-01-24 David Engster <deng@randomsample.de>
2 6
3 * eieio.texi (Introduction): Fix references. 7 * eieio.texi (Introduction): Fix references.
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index 40640f210cf..2d916b8416c 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -1173,7 +1173,7 @@ You can toggle each of these minor modes on and off, and you can
1173configure @ccmode{} so that it starts up with your favorite 1173configure @ccmode{} so that it starts up with your favorite
1174combination of them (@pxref{Sample Init File}). By default, when 1174combination of them (@pxref{Sample Init File}). By default, when
1175you initialize a buffer, electric mode and syntactic-indentation mode 1175you initialize a buffer, electric mode and syntactic-indentation mode
1176are enabled but the other two modes are disabled. 1176are enabled but the other three modes are disabled.
1177 1177
1178@ccmode{} displays the current state of the first four of these minor 1178@ccmode{} displays the current state of the first four of these minor
1179modes on the modeline by appending letters to the major mode's name, 1179modes on the modeline by appending letters to the major mode's name,