*** empty log message ***

2 files changed, 19 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 6d6a80f3af6..2d5a12a8828 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1068,6 +1068,16 @@ Note that +++ before an item means the Lisp manual has been updated.
 When you add a new item, please add it without either +++ or ---
 so I will know I still need to look at it -- rms.
 
+*** The buffer-local variable cursor-type can be used to specify the
+cursor to use in windows displaying a buffer.  Values are interpreted
+as follows:
+
+  t             use the cursor specified for the frame (default)
+  nil           don't display a cursor
+  `bar'         display a bar cursor with default width
+  (bar . WIDTH) display a bar cursor with width WIDTH
+  others        display a box cursor.
+
 ** The variable open-paren-in-column-0-is-defun-start controls whether
 an open parenthesis in column 0 is considered to be the start of a
 defun.  If set, the default, it is considered a defun start.  If not
diff --git a/src/ChangeLog b/src/ChangeLog
index 939956fe94c..c6e170ec30b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,14 @@
 2000-03-26  Gerd Moellmann  <gerd@gnu.org>
 
+        * xterm.c (x_display_and_set_cursor): Choose cursor depending
+        on buffer-local value of cursor_type.
+        (x_draw_bar_cursor): Add parameter WIDTH.
+
+        * buffer.c (reset_buffer): Initialize buffer's cursor_type.
+        (init_buffer_once): Set default cursor_type value to t.
+        Mark cursor_type as local everywhere.
+        (syms_of_buffer): New per-buffer variable cursor-type.
+
         * buffer.h (struct buffer): Remove member local_var_flags,
         add local_flags.
         (MAX_BUFFER_LOCAL_VARS): New macro.