aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-12-24 15:57:34 -0800
committerGlenn Morris2014-12-24 15:57:34 -0800
commit73c050cce729cd873aa1d4cdc6834c1e78a429b1 (patch)
tree8d390662d7ec8c252c6735b39fefa96d5c9f545f
parent1783e6cbb52bc0a9d31688fd11ad3a0e81473520 (diff)
downloademacs-73c050cce729cd873aa1d4cdc6834c1e78a429b1.tar.gz
emacs-73c050cce729cd873aa1d4cdc6834c1e78a429b1.zip
* doc/lispref/modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes.
-rw-r--r--doc/lispref/ChangeLog4
-rw-r--r--doc/lispref/modes.texi4
2 files changed, 6 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 5bf23bc895d..9ab84afde40 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12014-12-24 Glenn Morris <rgm@gnu.org>
2
3 * modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes.
4
12014-12-23 Eli Zaretskii <eliz@gnu.org> 52014-12-23 Eli Zaretskii <eliz@gnu.org>
2 6
3 * windows.texi (Recombining Windows): Index subject of sections. 7 * windows.texi (Recombining Windows): Index subject of sections.
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index d67bac63b15..509982a008e 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -1490,7 +1490,7 @@ A positive prefix argument enables the mode, any other prefix argument
1490disables it. From Lisp, an argument of @code{toggle} toggles the mode, 1490disables it. From Lisp, an argument of @code{toggle} toggles the mode,
1491whereas an omitted or @code{nil} argument enables the mode. 1491whereas an omitted or @code{nil} argument enables the mode.
1492This makes it easy to enable the minor mode in a major mode hook, for example. 1492This makes it easy to enable the minor mode in a major mode hook, for example.
1493If @var{doc} is nil, the macro supplies a default documentation string 1493If @var{doc} is @code{nil}, the macro supplies a default documentation string
1494explaining the above. 1494explaining the above.
1495 1495
1496By default, it also defines a variable named @var{mode}, which is set to 1496By default, it also defines a variable named @var{mode}, which is set to
@@ -3659,7 +3659,7 @@ For example:
3659Notice how those lexers return the empty string when in front of 3659Notice how those lexers return the empty string when in front of
3660parentheses. This is because SMIE automatically takes care of the 3660parentheses. This is because SMIE automatically takes care of the
3661parentheses defined in the syntax table. More specifically if the lexer 3661parentheses defined in the syntax table. More specifically if the lexer
3662returns nil or an empty string, SMIE tries to handle the corresponding 3662returns @code{nil} or an empty string, SMIE tries to handle the corresponding
3663text as a sexp according to syntax tables. 3663text as a sexp according to syntax tables.
3664 3664
3665@node SMIE Tricks 3665@node SMIE Tricks