* xdisp.c (get_window_cursor_type): Use cursor type specified by

	the selected buffer for the echo area too.

diff --git a/src/ChangeLog b/src/ChangeLog
index f11b1f23cefc87dc1ae13d6483c290538f043964..cabf73c908822e057b621db7ad1240c186fe4892 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/xdisp.c b/src/xdisp.c
index c7d3cf88ecf984362b173e3bd595fc128a4f2279..e242762dd3ea9cfda2edd32a3f573d4542506315 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -20772,12 +20772,17 @@ get_window_cursor_type (w, glyph, width, active_cursor)
     {
       if (w == XWINDOW (echo_area_window))
        {
-         *width = FRAME_CURSOR_WIDTH (f);
-         return FRAME_DESIRED_CURSOR (f);
-       }
+         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;
+         *active_cursor = 0;
+         non_selected = 1;
+       }
     }
 
   /* Nonselected window or nonselected frame.  */