From: Chong Yidong <cyd@gnu.org>
Date: Wed, 18 Dec 2013 05:31:11 +0000 (+0800)
Subject: Minor fixes for Lispref's modes.texi
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~349
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/fb891cc8185d27e99e432bf07c424441c8017a27

Minor fixes for Lispref's modes.texi

* modes.texi (Defining Minor Modes): Fix typo.
(Keymaps and Minor Modes): Fix binding convention.

Fixes: debbugs:11522 debbugs:14874
---

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 4f5ff0ecf4..07d153ed80 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-18  Chong Yidong  <cyd@gnu.org>
+
+	* modes.texi (Defining Minor Modes): Fix typo (Bug#14874).
+	(Keymaps and Minor Modes): Fix binding convention (Bug#11522).
+
 2013-12-13  Glenn Morris  <rgm@gnu.org>
 
 	* internals.texi (Building Emacs):
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index dc643bda9c..f04c0c1ea9 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -1506,9 +1506,11 @@ designed for abbrevs and Auto Fill mode.  Do not try substituting your
 own definition of @code{self-insert-command} for the standard one.  The
 editor command loop handles this function specially.)
 
-The key sequences bound in a minor mode should consist of @kbd{C-c}
-followed by one of @kbd{.,/?`'"[]\|~!#$%^&*()-_+=}.  (The other
-punctuation characters are reserved for major modes.)
+Minor modes may bind commands to key sequences consisting of @kbd{C-c}
+followed by a punctuation character.  However, sequences consisting of
+@kbd{C-c} followed by one of @kbd{@{@}<>:;}, or a control character or
+digit, are reserved for major modes.  Also, @kbd{C-c @var{letter}} is
+reserved for users.  @xref{Key Binding Conventions}.
 
 @node Defining Minor Modes
 @subsection Defining Minor Modes
@@ -1683,7 +1685,7 @@ minor modes don't need any.
 This defines a global toggle named @var{global-mode} whose meaning is
 to enable or disable the buffer-local minor mode @var{mode} in all
 buffers.  To turn on the minor mode in a buffer, it uses the function
-@var{turn-on}; to turn off the minor mode, it calls @code{mode} with
+@var{turn-on}; to turn off the minor mode, it calls @var{mode} with
 @minus{}1 as argument.
 
 Globally enabling the mode also affects buffers subsequently created