diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2006-01-19 21:12:22 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2006-01-19 21:12:22 +0000 |
| commit | 995f2df9d1c12c73077ecced0530bafa5cf91cf9 (patch) | |
| tree | 8e50b851b6f4c7d5366b4109bdb9124b37090a9b /src | |
| parent | dc38351b1f9b5fc4b6de694ee53994bb57b3a20c (diff) | |
| download | emacs-995f2df9d1c12c73077ecced0530bafa5cf91cf9.tar.gz | |
* xdisp.c (get_window_cursor_type): Use cursor type specified by
the selected buffer for the echo area too.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 15 |
2 files changed, 15 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f11b1f23cef..cabf73c9088 100644 --- 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 c7d3cf88ecf..e242762dd3e 100644 --- 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. */ |