(syms_of_buffer): Add default-cursor-type.

(init_buffer_once): Don't let cursor_type have a local value
in every buffer.

diff --git a/src/ChangeLog b/src/ChangeLog
index c6e170ec30b01d8ec1868a43c874e29c3d023616..10948007c83f05120eb654040f77875e295a4930 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2000-03-26  Gerd Moellmann  <gerd@gnu.org>
 
+       * buffer.c (syms_of_buffer): Add default-cursor-type.
+       (init_buffer_once): Don't let cursor_type have a local value
+       in every buffer.
+
        * xterm.c (x_display_and_set_cursor): Choose cursor depending
        on buffer-local value of cursor_type.
        (x_draw_bar_cursor): Add parameter WIDTH.

diff --git a/src/buffer.c b/src/buffer.c
index b243ab9415ebb9fd9d9131a2dd182ea4344fe97a..b57b9d8b1838b49170013d97bd602cf109a269e2 100644 (file)
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3939,7 +3939,6 @@ init_buffer_once ()
   XSETINT (buffer_local_flags.display_count, -1);
   XSETINT (buffer_local_flags.display_time, -1);
   XSETINT (buffer_local_flags.enable_multibyte_characters, -1);
-  XSETINT (buffer_local_flags.cursor_type, -1);
 
   idx = 1;
   XSETFASTINT (buffer_local_flags.mode_line_format, idx); ++idx;
@@ -3976,6 +3975,7 @@ init_buffer_once ()
   XSETFASTINT (buffer_local_flags.scroll_up_aggressively, idx); ++idx;
   XSETFASTINT (buffer_local_flags.scroll_down_aggressively, idx); ++idx;
   XSETFASTINT (buffer_local_flags.header_line_format, idx); ++idx;
+  XSETFASTINT (buffer_local_flags.cursor_type, idx); ++idx;
 
   /* Need more room? */
   if (idx >= MAX_BUFFER_LOCAL_VARS)
@@ -4131,6 +4131,10 @@ This is the same as (default-value 'mode-line-format).");
     "Default value of `header-line-format' for buffers that don't override it.\n\
 This is the same as (default-value 'header-line-format).");
 
+  DEFVAR_LISP_NOPRO ("default-cursor-type", &buffer_defaults.cursor_type,
+    "Default value of `cursor-type' for buffers that don't override it.\n\
+This is the same as (default-value 'cursor-type).");
+
   DEFVAR_LISP_NOPRO ("default-abbrev-mode",
              &buffer_defaults.abbrev_mode,
     "Default value of `abbrev-mode' for buffers that do not override it.\n\