Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-7

Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 4-14)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (base, patch 1-7)

   - tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
   - Update from CVS
   - Merge from emacs--devo--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10  (patch 187)

   - Update from CVS

6 files changed, 49 insertions, 25 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index e6ac498ce3a..ef07c950e09 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,21 @@
+2006-01-19  Richard M. Stallman  <rms@gnu.org>
+
+        * nonascii.texi (Translation of Characters): Search cmds use
+        translation-table-for-input.  Automatically made local.
+
+        * markers.texi (Overview of Markers): Count insertion type
+        as one of a marker's attributes.
+
+        * elisp.texi (Top): Menu clarification.
+
+        * display.texi (Other Display Specs): Delete duplicate entry for
+        just a string as display spec.  Move text about recursive display
+        specs on such a string.
+
+        * commands.texi (Key Sequence Input): Clarify.
+        Move num-nonmacro-input-events out.
+        (Reading One Event): num-nonmacro-input-events moved here.
+
 2006-01-14  Nick Roberts  <nickrob@snap.net.nz>
 
         * advice.texi (Simple Advice): Update example to fit argument
diff --git a/lispref/commands.texi b/lispref/commands.texi
index ed9cb2cf3ca..0d5e8b232ff 100644
--- a/lispref/commands.texi
+++ b/lispref/commands.texi
@@ -2074,6 +2074,9 @@ Otherwise, it returns a vector, since a vector can hold all kinds of
 events---characters, symbols, and lists.  The elements of the string or
 vector are the events in the key sequence.
 
+Reading a key sequence includes translating the events in various
+ways.  @xref{Translating Input}.
+
 The argument @var{prompt} is either a string to be displayed in the
 echo area as a prompt, or @code{nil}, meaning not to display a prompt.
 The argument @var{continue-echo}, if non-@code{nil}, means to echo
@@ -2097,8 +2100,8 @@ key sequence is being read by something that will read commands one
 after another.  It should be @code{nil} if the caller will read just
 one key sequence.
 
-In the example below, the prompt @samp{?} is displayed in the echo area,
-and the user types @kbd{C-x C-f}.
+In the following example, Emacs displays the prompt @samp{?} in the
+echo area, and then the user types @kbd{C-x C-f}.
 
 @example
 (read-key-sequence "?")
@@ -2173,11 +2176,6 @@ this Emacs session.  This includes key sequences read from the terminal
 and key sequences read from keyboard macros being executed.
 @end defvar
 
-@defvar num-nonmacro-input-events
-This variable holds the total number of input events received so far
-from the terminal---not counting those generated by keyboard macros.
-@end defvar
-
 @node Reading One Event
 @subsection Reading One Event
 @cindex reading a single event
@@ -2265,6 +2263,11 @@ user generates an event which is not a character,
 gets a character.  The arguments work as in @code{read-event}.
 @end defun
 
+@defvar num-nonmacro-input-events
+This variable holds the total number of input events received so far
+from the terminal---not counting those generated by keyboard macros.
+@end defvar
+
 @node Invoking the Input Method
 @subsection Invoking the Input Method
 
diff --git a/lispref/display.texi b/lispref/display.texi
index 14d44a1b995..1bd10113ce9 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -3277,6 +3277,9 @@ in the @code{display} text property.
 @item @var{string}
 Display @var{string} instead of the text that has this property.
 
+Recursive display specifications are not supported---@var{string}'s
+@code{display} properties, if any, are not used.
+
 @item (image . @var{image-props})
 This kind of display specification is an image descriptor (@pxref{Images}).
 When used as a display specification, it means to display the image
@@ -3292,14 +3295,11 @@ in the range 0.0--1.0 stands for that fraction of the width or height
 of the entire image.
 
 @item ((margin nil) @var{string})
-@itemx @var{string}
 A display specification of this form means to display @var{string}
 instead of the text that has the display specification, at the same
-position as that text.  This is a special case of marginal display
-(@pxref{Display Margins}).
-
-Recursive display specifications are not supported---string display
-specifications must not have @code{display} properties themselves.
+position as that text.  It is equivalent to using just @var{string},
+but it is done as a special case of marginal display (@pxref{Display
+Margins}).
 
 @item (space-width @var{factor})
 This display specification affects all the space characters within the
diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index 79f62112730..1a300c3dd9a 100644
--- a/lispref/elisp.texi
+++ b/lispref/elisp.texi
@@ -123,7 +123,7 @@ Reference Manual, corresponding to GNU Emacs version @value{EMACSVER}.
                               files are made.
 * Buffers::                 Creating and using buffer objects.
 * Windows::                 Manipulating windows and displaying buffers.
-* Frames::                  Making multiple X windows.
+* Frames::                  Making multiple system-level windows.
 * Positions::               Buffer positions and motion functions.
 * Markers::                 Markers represent positions and update
                               automatically when the text is changed.
diff --git a/lispref/markers.texi b/lispref/markers.texi
index ab16afc3ac4..aa26a0aa030 100644
--- a/lispref/markers.texi
+++ b/lispref/markers.texi
@@ -36,14 +36,15 @@ way usually points to a position in the buffer that the function
 operates on, but that is entirely the programmer's responsibility.
 @xref{Positions}, for a complete description of positions.
 
-  A marker has two attributes: the marker position, and the marker
-buffer.  The marker position is an integer that is equivalent (at a
-given time) to the marker as a position in that buffer.  But the
-marker's position value can change often during the life of the marker.
-Insertion and deletion of text in the buffer relocate the marker.  The
-idea is that a marker positioned between two characters remains between
-those two characters despite insertion and deletion elsewhere in the
-buffer.  Relocation changes the integer equivalent of the marker.
+  A marker has three attributes: the marker position, the marker
+buffer, and the insertion type.  The marker position is an integer
+that is equivalent (at a given time) to the marker as a position in
+that buffer.  But the marker's position value can change often during
+the life of the marker.  Insertion and deletion of text in the buffer
+relocate the marker.  The idea is that a marker positioned between two
+characters remains between those two characters despite insertion and
+deletion elsewhere in the buffer.  Relocation changes the integer
+equivalent of the marker.
 
 @cindex marker relocation
   Deleting text around a marker's position leaves the marker between the
diff --git a/lispref/nonascii.texi b/lispref/nonascii.texi
index 73632e36514..6e41a462934 100644
--- a/lispref/nonascii.texi
+++ b/lispref/nonascii.texi
@@ -578,12 +578,14 @@ coding systems that don't specify any other translation table.
 
 @defvar translation-table-for-input
 Self-inserting characters are translated through this translation
-table before they are inserted.  This variable automatically becomes
-buffer-local when set.
+table before they are inserted.  Search commands also translate their
+input through this table, so they can compare more reliably with
+what's in the buffer.
 
 @code{set-buffer-file-coding-system} sets this variable so that your
 keyboard input gets translated into the character sets that the buffer
-is likely to contain.
+is likely to contain.  This variable automatically becomes
+buffer-local when set.
 @end defvar
 
 @node Coding Systems