Mercurial > emacs
changeset 68275:a34c3ba8e4aa
* xdisp.c (get_window_cursor_type): Use cursor type specified by
the selected buffer for the echo area too.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 19 Jan 2006 21:12:22 +0000 |
| parents | eba4160169ef |
| children | 873a6f48b596 |
| files | src/ChangeLog src/xdisp.c |
| diffstat | 2 files changed, 16 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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. */