@c This is part of the Emacs manual.
-@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2013 Free Software
+@c Copyright (C) 1985-1987, 1993-1995, 1997, 2001-2015 Free Software
@c Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Glossary
@unnumbered Glossary
+@cindex glossary
@table @asis
@anchor{Glossary---Abbrev}
commands @kbd{C-]} and @kbd{M-x top-level} are used for this.
@xref{Quitting}.
-@c FIXME? Active Region
+@item 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.
+@xref{Mark}.
@item Alt
Alt is the name of a modifier bit that a keyboard input character may
-have. To make a character Alt, type it while holding down the @key{ALT}
-key. Such characters are given names that start with @kbd{Alt-}
+have. To make a character Alt, type it while holding down the @key{Alt}
+key. Such characters are given names that start with @kbd{@key{Alt}-}
(usually written @kbd{A-} for short). (Note that many terminals have a
-key labeled @key{ALT} that is really a @key{META} key.) @xref{User
+key labeled @key{Alt} that is really a @key{META} key.) @xref{User
Input, Alt}.
@item Argument
minibuffer (q.v.@:) arguments when the set of possible valid inputs
is known; for example, on command names, buffer names, and
file names. Completion usually occurs when @key{TAB}, @key{SPC} or
-@key{RET} is typed. @xref{Completion}.@refill
+@key{RET} is typed. @xref{Completion}.
@anchor{Glossary---Continuation Line}
@item Continuation Line
@item Control Character
A control character is a character that you type by holding down the
-@key{CTRL} key. Some control characters also have their own keys, so
-that you can type them without using @key{CTRL}. For example,
+@key{Ctrl} key. Some control characters also have their own keys, so
+that you can type them without using @key{Ctrl}. For example,
@key{RET}, @key{TAB}, @key{ESC} and @key{DEL} are all control
characters. @xref{User Input}.
The particular form of copyleft used by the GNU project is called the
GNU General Public License. @xref{Copying}.
-@item @key{CTRL}
-The @key{CTRL} or ``control'' key is what you hold down
+@item @key{Ctrl}
+The @key{Ctrl} or ``control'' key is what you hold down
in order to enter a control character (q.v.). @xref{Glossary---C-}.
@item Current Buffer
@item @key{DEL}
@key{DEL} is a character that runs the command to delete one character
-of text before the cursor. It is typically either the @key{DELETE}
+of text before the cursor. It is typically either the @key{Delete}
key or the @key{BACKSPACE} key, whichever one is easy to type.
@xref{Erasing,DEL}.
@item Hyper
Hyper is the name of a modifier bit that a keyboard input character may
have. To make a character Hyper, type it while holding down the
-@key{HYPER} key. Such characters are given names that start with
+@key{Hyper} key. Such characters are given names that start with
@kbd{Hyper-} (usually written @kbd{H-} for short). @xref{User Input}.
@item Iff
@xref{Locals}.
@item @kbd{M-}
-@kbd{M-} in the name of a character is an abbreviation for @key{META},
+@kbd{M-} in the name of a character is an abbreviation for @key{Meta},
one of the modifier keys that can accompany any character.
@xref{User Input,M-}.
which configures Emacs for editing a certain sort of text. Ideally,
each programming language has its own major mode. @xref{Major Modes}.
+@c FIXME: Mention margins for filling?
@item Margin
The space between the usable part of a window (including the
fringe) and the window edge.
@item Meta
Meta is the name of a modifier bit which you can use in a command
-character. To enter a meta character, you hold down the @key{META}
+character. To enter a meta character, you hold down the @key{Meta}
key while typing the character. We refer to such characters with
names that start with @kbd{Meta-} (usually written @kbd{M-} for
-short). For example, @kbd{M-<} is typed by holding down @key{META}
+short). For example, @kbd{M-<} is typed by holding down @key{Meta}
and at the same time typing @kbd{<} (which itself is done, on most
terminals, by holding down @key{SHIFT} and typing @kbd{,}).
@xref{User Input,Meta}.
-On some terminals, the @key{META} key is actually labeled @key{ALT}
-or @key{EDIT}.
+On some terminals, the @key{Meta} key is actually labeled @key{Alt}
+or @key{Edit}.
@item Meta Character
A Meta character is one whose character code includes the Meta bit.
yanking (q.v.@:) it. @xref{Killing}.
@item MULE
-MULE refers to the Emacs features for editing multilingual
-non-@acronym{ASCII} text using multibyte characters (q.v.).
-@xref{International}.
+@cindex MULE
+Prior to Emacs 23, @acronym{MULE} was the name of a software package
+which provided a @dfn{MULtilingual Enhancement} to Emacs, by adding
+support for multiple character sets (q.v.). @acronym{MULE} was later
+integrated into Emacs, and much of it was replaced when Emacs gained
+internal Unicode support in version 23.
+
+Some parts of Emacs that deal with character set support still use the
+@acronym{MULE} name. @xref{International}.
@item Multibyte Character
A multibyte character is a character that takes up several bytes in a
(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}.
-@c FIXME? Transient Mark Mode
+@item Transient Mark Mode
+The default behavior of the mark (q.v.@:) and region (q.v.), in which
+setting the mark activates it and highlights the region, is called
+Transient Mark mode. 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