aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2013-12-18 13:31:11 +0800
committerChong Yidong2013-12-18 13:31:11 +0800
commitfb891cc8185d27e99e432bf07c424441c8017a27 (patch)
tree9e636f278749b3de4c4df137a73a4d2dc997e7c0
parent50ff2e06756b2b0565d3a815efe52be1e7247d0b (diff)
downloademacs-fb891cc8185d27e99e432bf07c424441c8017a27.tar.gz
emacs-fb891cc8185d27e99e432bf07c424441c8017a27.zip
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
-rw-r--r--doc/lispref/ChangeLog5
-rw-r--r--doc/lispref/modes.texi10
2 files changed, 11 insertions, 4 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 4f5ff0ecf44..07d153ed80e 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
12013-12-18 Chong Yidong <cyd@gnu.org>
2
3 * modes.texi (Defining Minor Modes): Fix typo (Bug#14874).
4 (Keymaps and Minor Modes): Fix binding convention (Bug#11522).
5
12013-12-13 Glenn Morris <rgm@gnu.org> 62013-12-13 Glenn Morris <rgm@gnu.org>
2 7
3 * internals.texi (Building Emacs): 8 * internals.texi (Building Emacs):
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index dc643bda9c8..f04c0c1ea9f 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
1506own definition of @code{self-insert-command} for the standard one. The 1506own definition of @code{self-insert-command} for the standard one. The
1507editor command loop handles this function specially.) 1507editor command loop handles this function specially.)
1508 1508
1509The key sequences bound in a minor mode should consist of @kbd{C-c} 1509Minor modes may bind commands to key sequences consisting of @kbd{C-c}
1510followed by one of @kbd{.,/?`'"[]\|~!#$%^&*()-_+=}. (The other 1510followed by a punctuation character. However, sequences consisting of
1511punctuation characters are reserved for major modes.) 1511@kbd{C-c} followed by one of @kbd{@{@}<>:;}, or a control character or
1512digit, are reserved for major modes. Also, @kbd{C-c @var{letter}} is
1513reserved for users. @xref{Key Binding Conventions}.
1512 1514
1513@node Defining Minor Modes 1515@node Defining Minor Modes
1514@subsection Defining Minor Modes 1516@subsection Defining Minor Modes
@@ -1683,7 +1685,7 @@ minor modes don't need any.
1683This defines a global toggle named @var{global-mode} whose meaning is 1685This defines a global toggle named @var{global-mode} whose meaning is
1684to enable or disable the buffer-local minor mode @var{mode} in all 1686to enable or disable the buffer-local minor mode @var{mode} in all
1685buffers. To turn on the minor mode in a buffer, it uses the function 1687buffers. To turn on the minor mode in a buffer, it uses the function
1686@var{turn-on}; to turn off the minor mode, it calls @code{mode} with 1688@var{turn-on}; to turn off the minor mode, it calls @var{mode} with
1687@minus{}1 as argument. 1689@minus{}1 as argument.
1688 1690
1689Globally enabling the mode also affects buffers subsequently created 1691Globally enabling the mode also affects buffers subsequently created