[Emacs-diffs] /srv/bzr/emacs/trunk r105145: Manual fixes related to clarifying cursor shapes

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105145
fixes bug(s): http://debbugs.gnu.org/4345
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-13 00:37:20 +0200
message:
  Manual fixes related to clarifying cursor shapes
modified:
  doc/emacs/ChangeLog
  doc/emacs/display.texi
  doc/emacs/screen.texi

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2011-07-12 15:29:27 +0000
+++ b/doc/emacs/ChangeLog       2011-07-12 22:37:20 +0000
@@ -1,3 +1,10 @@
+2011-07-12  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * display.texi (Cursor Display): Mention `cursor-type'.
+
+       * screen.texi (Point): Clarify that it's only if you use a block
+       cursor that it appears to be on a character (bug#4345).
+
 2011-07-12  Chong Yidong  <address@hidden>
 
        * misc.texi (Amusements): Move dissociated press here, from its

=== modified file 'doc/emacs/display.texi'
--- a/doc/emacs/display.texi    2011-07-03 21:33:54 +0000
+++ b/doc/emacs/display.texi    2011-07-12 22:37:20 +0000
@@ -1211,6 +1211,10 @@
 You can control how the cursor appears when it blinks off by setting
 the variable @code{blink-cursor-alist}.
 
address@hidden cursor-type
+  You can change the shape of the cursor from the default ``box'' look
+to a bar by altering the @code{cursor-type} variable.
+
 @vindex visible-cursor
   Some text terminals offer two different cursors: the normal cursor
 and the very visible cursor, where the latter may be e.g. bigger or

=== modified file 'doc/emacs/screen.texi'
--- a/doc/emacs/screen.texi     2011-07-10 14:40:21 +0000
+++ b/doc/emacs/screen.texi     2011-07-12 22:37:20 +0000
@@ -73,14 +73,14 @@
 clicking mouse button 1 (normally the left button) at the desired
 location.
 
-  While the cursor appears to be @emph{on} a character, you should
-think of point as @emph{between} two characters; it points @emph{before}
-the character that appears under the cursor.  For example, if your text
-looks like @samp{frob} with the cursor over the @samp{b}, then point is
-between the @samp{o} and the @samp{b}.  If you insert the character
address@hidden at that position, the result is @samp{fro!b}, with point
-between the @samp{!} and the @samp{b}.  Thus, the cursor remains over
-the @samp{b}, as before.
+  If you use a block cursor, the cursor appears to be @emph{on} a
+character, but you should think of point as @emph{between} two
+characters; it points @emph{before} the character that appears under
+the cursor.  For example, if your text looks like @samp{frob} with the
+cursor over the @samp{b}, then point is between the @samp{o} and the
address@hidden  If you insert the character @samp{!} at that position, the
+result is @samp{fro!b}, with point between the @samp{!} and the
address@hidden  Thus, the cursor remains over the @samp{b}, as before.
 
   Sometimes people speak of ``the cursor'' when they mean ``point,'' or
 speak of commands that move point as ``cursor motion'' commands.
@@ -92,12 +92,14 @@
 its own point location.  If the same buffer appears in more than one
 window, each window has its own point position in that buffer.
 
-  On a graphical display, Emacs shows a cursor in each window; the
-selected window's cursor is solid and blinking, and the other cursors
-are hollow.  On a text-only terminal, there is just one cursor, in the
-selected window; even though the unselected windows have their own
-point positions, they do not display a cursor.  @xref{Cursor Display},
-for customizable variables that control cursor display.
+  On a graphical display, Emacs shows a cursor in each window.  The
+selected window's cursor will be blinking.  If you use the default,
address@hidden cursor type, the selected window's cursor will be solid,
+and the other cursors are hollow.  On a text-only terminal, there is
+just one cursor, in the selected window; even though the unselected
+windows have their own point positions, they do not display a cursor.
address@hidden Display}, for customizable variables that control cursor
+display.
 
 @node Echo Area
 @section The Echo Area