# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1137705142 0
# Node ID a34c3ba8e4aa63dcd00dd19e18ed6f06c4ea2dec
# Parent  eba4160169ef089b7233223cca39cf08d0b25625
	* xdisp.c (get_window_cursor_type): Use cursor type specified by
	the selected buffer for the echo area too.

diff -r eba4160169ef -r a34c3ba8e4aa src/ChangeLog
--- a/src/ChangeLog	Thu Jan 19 19:34:27 2006 +0000
+++ b/src/ChangeLog	Thu Jan 19 21:12:22 2006 +0000
@@ -1,3 +1,8 @@
+2006-01-19  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xdisp.c (get_window_cursor_type): Use cursor type specified by
+	the selected buffer for the echo area too.
+
 2006-01-19  Richard M. Stallman  <rms@gnu.org>
 
 	* keymap.c (Fmap_keymap): Doc fix.
diff -r eba4160169ef -r a34c3ba8e4aa src/xdisp.c
--- a/src/xdisp.c	Thu Jan 19 19:34:27 2006 +0000
+++ b/src/xdisp.c	Thu Jan 19 21:12:22 2006 +0000
@@ -20772,12 +20772,17 @@
     {
       if (w == XWINDOW (echo_area_window))
 	{
-	  *width = FRAME_CURSOR_WIDTH (f);
-	  return FRAME_DESIRED_CURSOR (f);
-	}
-
-      *active_cursor = 0;
-      non_selected = 1;
+	  if (EQ (b->cursor_type, Qt) || NILP (b->cursor_type))
+	    {
+	      *width = FRAME_CURSOR_WIDTH (f);
+	      return FRAME_DESIRED_CURSOR (f);
+	    }
+	  else
+	    return get_specified_cursor_type (b->cursor_type, width);
+
+	  *active_cursor = 0;
+	  non_selected = 1;
+	}
     }
 
   /* Nonselected window or nonselected frame.  */