Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-44

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 272-288)

   - src/xdisp.c (dump_glyph_row): Don't display overlay_arrow_p field.
   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 67)

   - Update from CVS

1 files changed, 6 insertions, 0 deletions

diff --git a/src/buffer.c b/src/buffer.c
index d24deb0a9a1..6733cbf0815 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -5084,6 +5084,7 @@ init_buffer_once ()
   XSETFASTINT (buffer_local_flags.header_line_format, idx); ++idx;
   XSETFASTINT (buffer_local_flags.cursor_type, idx); ++idx;
   XSETFASTINT (buffer_local_flags.extra_line_spacing, idx); ++idx;
+  XSETFASTINT (buffer_local_flags.cursor_in_non_selected_windows, idx); ++idx;
 
   /* Need more room? */
   if (idx >= MAX_PER_BUFFER_VARS)
@@ -5954,6 +5955,11 @@ The space is measured in pixels, and put below lines on window systems.
 If value is a floating point number, it specifies the spacing relative
 to the default frame line height.  */);
 
+  DEFVAR_PER_BUFFER ("cursor-in-non-selected-windows",
+                     &current_buffer->cursor_in_non_selected_windows, Qt,
+    doc: /* *Cursor type to display in non-selected windows.
+t means to use hollow box cursor.  See `cursor-type' for other values.  */);
+
   DEFVAR_LISP ("kill-buffer-query-functions", &Vkill_buffer_query_functions,
                doc: /* List of functions called with no args to query before killing a buffer.  */);
   Vkill_buffer_query_functions = Qnil;