summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--man/ChangeLog5
-rw-r--r--man/abbrevs.texi13
2 files changed, 12 insertions, 6 deletions
diff --git a/man/ChangeLog b/man/ChangeLog
index 466d16d51e2..8088fe39fe0 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-23 Richard Stallman <rms@gnu.org>
+
+ * abbrevs.texi (Expanding Abbrevs): Expansion happens only when
+ Abbrev mode is enabled.
+
2006-10-20 Masatake YAMATO <jet@gyve.org>
* cc-mode.texi (Sample .emacs File): Added missing `)' in
diff --git a/man/abbrevs.texi b/man/abbrevs.texi
index 3aac1df50d8..0283b332976 100644
--- a/man/abbrevs.texi
+++ b/man/abbrevs.texi
@@ -146,12 +146,13 @@ abbrev definitions, both global and local.
@node Expanding Abbrevs
@section Controlling Abbrev Expansion
- An abbrev expands whenever it is present in the buffer just before
-point and you type a self-inserting whitespace or punctuation character
-(@key{SPC}, comma, etc.@:). More precisely, any character that is not a
-word constituent expands an abbrev, and any word-constituent character
-can be part of an abbrev. The most common way to use an abbrev is to
-insert it and then insert a punctuation or whitespace character to expand it.
+ When Abbrev mode is enabled, an abbrev expands whenever it is
+present in the buffer just before point and you type a self-inserting
+whitespace or punctuation character (@key{SPC}, comma, etc.@:). More
+precisely, any character that is not a word constituent expands an
+abbrev, and any word-constituent character can be part of an abbrev.
+The most common way to use an abbrev is to insert it and then insert a
+punctuation or whitespace character to expand it.
@vindex abbrev-all-caps
Abbrev expansion preserves case; thus, @samp{foo} expands into @samp{find