[Emacs-diffs] trunk r113575: * doc/emacs/glossary.texi (Glossary): Add some entries.

[Xue Fuqiao]

------------------------------------------------------------
revno: 113575
revision-id: address@hidden
parent: address@hidden
committer: Xue Fuqiao <address@hidden>
branch nick: trunk
timestamp: Sun 2013-07-28 13:54:24 +0800
message:
  * doc/emacs/glossary.texi (Glossary): Add some entries.
modified:
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/glossary.texi        
glossary.texi-20091113204419-o5vbwnq5f7feedwu-6253

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2013-07-27 00:23:21 +0000
+++ b/doc/emacs/ChangeLog       2013-07-28 05:54:24 +0000
@@ -1,3 +1,7 @@
+2013-07-28  Xue Fuqiao  <address@hidden>
+
+       * glossary.texi (Glossary): Add some entries.
+
 2013-07-27  Xue Fuqiao  <address@hidden>
 
        * maintaining.texi (VC Directory Commands): Mention `D' and `L' in

=== modified file 'doc/emacs/glossary.texi'
--- a/doc/emacs/glossary.texi   2013-01-01 09:11:05 +0000
+++ b/doc/emacs/glossary.texi   2013-07-28 05:54:24 +0000
@@ -4,6 +4,7 @@
 @c See file emacs.texi for copying conditions.
 @node Glossary
 @unnumbered Glossary
address@hidden glossary
 
 @table @asis
 @anchor{Glossary---Abbrev}
@@ -18,7 +19,10 @@
 commands @kbd{C-]} and @kbd{M-x top-level} are used for this.
 @xref{Quitting}.
 
address@hidden FIXME?  Active Region
address@hidden Active Region
+Setting the mark (q.v.) at a position in the text also activates it.
+When the mark is active, we call the region an active region.
address@hidden
 
 @item Alt
 Alt is the name of a modifier bit that a keyboard input character may
@@ -183,6 +187,11 @@
 @item Character Terminal
 @xref{Glossary---Text Terminal}.
 
address@hidden Chord
+A chord is a key sequence (q.v.) in which the keys are pressed at the
+same time.  For example: @kbd{S-M-C-a}.  You can hold down a chord to
+repeat its command.
+
 @item Click Event
 A click event is the kind of input event (q.v.@:) generated when you
 press a mouse button and release it without moving the mouse.
@@ -1365,7 +1374,10 @@
 (q.v.), and not in the middle of a command.  You can get back to top
 level by aborting (q.v.@:) and quitting (q.v.).  @xref{Quitting}.
 
address@hidden FIXME?  Transient Mark Mode
address@hidden Transient Mark Mode
+Transient Mark mode gives you much of the standard
+selection-highlighting behavior of other editors.  In GNU Emacs 23 and
+onwards, it is enabled by default.  @xref{Disabled Transient Mark}.
 
 @item Transposition
 Transposing two units of text means putting each one into the place