Merge from emacs--rel--22

Revision: [email protected]/emacs--devo--0--patch-875

6 files changed, 82 insertions, 29 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index e5097a4d17..5c4f915906 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -6,6 +6,22 @@
 
 	* display.texi (Auto Faces): Fix typo.
 
+2007-10-02  Richard Stallman  <[email protected]>
+
+	* display.texi (Display Property): Explain some display specs
+	don't let you move point in.
+
+	* frames.texi (Cursor Parameters): Describe
+	cursor-in-non-selected-windows here.  Explain more values.
+
+	* windows.texi (Basic Windows): Don't describe
+	cursor-in-non-selected-windows here.
+
+2007-10-01  Eli Zaretskii  <[email protected]>
+
+	* processes.texi (Misc Network): Note that these functions are
+	supported only on some systems.
+
 2007-10-01  Richard Stallman  <[email protected]>
 
 	* display.texi (Overlay Properties): Explain nil as priority.
@@ -16,6 +32,12 @@
 
 	* macros.texi (Backquote): Minor clarification.
 
+2007-09-19  Richard Stallman  <[email protected]>
+
+	* display.texi (Display Property): Explain multiple display specs.
+	Clarify when they work in parallel and when one overrides.
+	Fix error in example.
+
 2007-09-06  Glenn Morris  <[email protected]>
 
 	* Move from lispref/ to doc/lispref/.  Change all setfilename
@@ -27,6 +49,12 @@
 	* makefile.w32-in (infodir, texinputdir): Go up one more level.
 	(usermanualdir): Change from ../man to ../emacs.
 
+2007-08-30  Martin Rudalics  <[email protected]>
+
+	* commands.texi (Command Loop Info): Advise against changing
+	most variables described here.  Explain new variable
+	last-repeatable-command.
+
 2007-08-29  Glenn Morris  <[email protected]>
 
 	* elisp.texi (EMACSVER): Increase to 23.0.50.
@@ -46,6 +74,11 @@
 	"Image Formats".
 	(Image Formats): New node.
 
+2007-08-27  Richard Stallman  <[email protected]>
+
+	* windows.texi (Window Configurations): Clarify what
+	a window configuration saves.
+
 2007-08-25  Richard Stallman  <[email protected]>
 
 	* display.texi (Images): Delete redundant @findex.
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index ae48b0e39d..aaad7ca82a 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -716,7 +716,9 @@ caller to ``pretend'' that the function was called interactively.
 @section Information from the Command Loop
 
 The editor command loop sets several Lisp variables to keep status
-records for itself and for commands that are run.
+records for itself and for commands that are run.  With the exception of
+@code{this-command} and @code{last-command} it's generally a bad idea to
+change any of these variables in a Lisp program.
 
 @defvar last-command
 This variable records the name of the previous command executed by the
@@ -736,6 +738,12 @@ This variable is set up by Emacs just like @code{last-command},
 but never altered by Lisp programs.
 @end defvar
 
+@defvar last-repeatable-command
+This variable stores the most recently executed command that was not
+part of an input event.  This is the command @code{repeat} will try to
+repeat, @xref{Repeating,,, emacs, The GNU Emacs Manual}.
+@end defvar
+
 @defvar this-command
 @cindex current command
 This variable records the name of the command now being executed by
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 6e85bb3f3e..90d94dbe6b 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -3245,15 +3245,21 @@ to use the value specified by the frame.
 insert images into text, and also control other aspects of how text
 displays.  The value of the @code{display} property should be a
 display specification, or a list or vector containing several display
-specifications.
-
-  Some kinds of @code{display} properties specify something to display
-instead of the text that has the property.  In this case, ``the text''
-means all the consecutive characters that have the same Lisp object as
-their @code{display} property; these characters are replaced as a
-single unit.  By contrast, characters that have similar but distinct
-Lisp objects as their @code{display} properties are handled
-separately.  Here's a function that illustrates this point:
+specifications.  Display specifications generally apply in parallel to
+the text they cover.
+
+  Some kinds of @code{display} specifications specify something to
+display instead of the text that has the property.  If a list of
+display specifications includes more than one of this kind, the first
+is effective and the rest are ignored.  You cannot interactively move
+point into the middle of the text that is thus replaced.
+
+  For these specifications, ``the text that has the property'' means
+all the consecutive characters that have the same Lisp object as their
+@code{display} property; these characters are replaced as a single
+unit.  By contrast, characters that have similar but distinct Lisp
+objects as their @code{display} properties are handled separately.
+Here's a function that illustrates this point:
 
 @smallexample
 (defun foo ()
@@ -3281,7 +3287,7 @@ results:
   (goto-char (point-min))
   (dotimes (i 5)
     (let ((string (concat "A")))
-      (put-text-property (point) (2+ (point)) 'display string)
+      (put-text-property (point) (+ 2 (point)) 'display string)
       (put-text-property (point) (1+ (point)) 'display string)
       (forward-char 2))))
 @end smallexample
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 2ab0a65a63..ee07302d76 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -663,8 +663,17 @@ should be suitable values for the @code{cursor-type} frame parameter.
 
 There are various defaults for how to blink each type of cursor, if
 the type is not mentioned as an @var{on-state} here.  Changes in this
-variable do not take effect immediately, because the variable is
-examined only when you specify the @code{cursor-type} parameter.
+variable do not take effect immediately, only when you specify the
+@code{cursor-type} frame parameter.
+@end defvar
+
+@defvar cursor-in-non-selected-windows
+This variable controls how the cursor looks in a window that is not
+selected.  It supports the same values as the @code{cursor-type} frame
+parameter; also, @code{nil} means don't display a cursor in
+nonselected windows, and @code{t} (the default) means use a standard
+modificatoin of the usual cursor type (solid box becomes hollow box,
+and bar becomes a narrower bar).
 @end defvar
 
 @node Color Parameters
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 88c5116173..28e41a0997 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -2062,7 +2062,8 @@ That particular network option is supported by
 @section Misc Network Facilities
 
   These additional functions are useful for creating and operating
-on network connections.
+on network connections.  Note that they are supported only on some
+systems.
 
 @defun network-interface-list
 This function returns a list describing the network interfaces
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi
index 81c4c8a4ae..9a49401485 100644
--- a/doc/lispref/windows.texi
+++ b/doc/lispref/windows.texi
@@ -55,15 +55,11 @@ multiple nonoverlapping Emacs windows.
   In each frame, at any time, one and only one window is designated as
 @dfn{selected within the frame}.  The frame's cursor appears in that
 window, but the other windows have ``non-selected'' cursors, normally
-less visible.  At any time, one frame is the selected frame; and the
-window selected within that frame is @dfn{the selected window}.  The
-selected window's buffer is usually the current buffer (except when
-@code{set-buffer} has been used).  @xref{Current Buffer}.
-
-@defvar cursor-in-non-selected-windows
-If this variable is @code{nil}, Emacs displays only one cursor,
-in the selected window.  Other windows have no cursor at all.
-@end defvar
+less visible.  (@pxref{Cursor Parameters}, for customization of this.)
+At any time, one frame is the selected frame; and the window selected
+within that frame is @dfn{the selected window}.  The selected window's
+buffer is usually the current buffer (except when @code{set-buffer}
+has been used).  @xref{Current Buffer}.
 
   For practical purposes, a window exists only while it is displayed in
 a frame.  Once removed from the frame, the window is effectively deleted
@@ -2246,13 +2242,13 @@ similar to the value returned by @code{window-edges}.
 @cindex saving window information
 
   A @dfn{window configuration} records the entire layout of one
-frame---all windows, their sizes, which buffers they contain, what
-part of each buffer is displayed, and the values of point and the
-mark; also their fringes, margins, and scroll bar settings.  It also
+frame---all windows, their sizes, which buffers they contain, how
+those buffers are scrolled, and their values of point and the mark;
+also their fringes, margins, and scroll bar settings.  It also
 includes the values of @code{window-min-height},
-@code{window-min-width} and @code{minibuffer-scroll-window}.  An
-exception is made for point in the selected window for the current
-buffer; its value is not saved in the window configuration.
+@code{window-min-width} and @code{minibuffer-scroll-window}.  As a
+special exception, the window configuration does not record the value
+of point in the selected window for the current buffer.
 
   You can bring back an entire previous layout by restoring a window
 configuration previously saved.  If you want to record all frames