Mercurial > emacs
changeset 36255:1890bad59762
Use display_hourglass_p, start_hourglass,
cancel_hourglass instead of the old names.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Wed, 21 Feb 2001 13:57:40 +0000 |
| parents | f64eaa8f61aa |
| children | e033d60bd048 |
| files | src/keyboard.c src/minibuf.c |
| diffstat | 2 files changed, 22 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/src/keyboard.c Wed Feb 21 13:56:29 2001 +0000 +++ b/src/keyboard.c Wed Feb 21 13:57:40 2001 +0000 @@ -1,5 +1,5 @@ /* Keyboard and mouse input; editor command loop. - Copyright (C) 1985,86,87,88,89,93,94,95,96,97,99, 2000 + Copyright (C) 1985,86,87,88,89,93,94,95,96,97,99, 2000, 2001 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -920,11 +920,11 @@ } #ifdef HAVE_X_WINDOWS - /* The command loop has started a busy-cursor timer, so we have to + /* The command loop has started an hourglass timer, so we have to cancel it here, otherwise it will fire because the recursive edit can take some time. */ - if (display_busy_cursor_p) - cancel_busy_cursor (); + if (display_hourglass_p) + cancel_hourglass (); #endif /* This function may have been called from a debugger called from @@ -1249,8 +1249,8 @@ () { #ifdef HAVE_X_WINDOWS - if (display_busy_cursor_p) - cancel_busy_cursor (); + if (display_hourglass_p) + cancel_hourglass (); #endif return Fthrow (Qtop_level, Qnil); } @@ -1606,8 +1606,8 @@ /* Here for a command that isn't executed directly */ #ifdef HAVE_X_WINDOWS - if (display_busy_cursor_p) - start_busy_cursor (); + if (display_hourglass_p) + start_hourglass (); #endif nonundocount = 0; @@ -1616,8 +1616,8 @@ Fcommand_execute (Vthis_command, Qnil, Qnil, Qnil); #ifdef HAVE_X_WINDOWS - if (display_busy_cursor_p) - cancel_busy_cursor (); + if (display_hourglass_p) + cancel_hourglass (); #endif } directly_done: ; @@ -8896,8 +8896,8 @@ } #ifdef HAVE_X_WINDOWS - if (display_busy_cursor_p) - cancel_busy_cursor (); + if (display_hourglass_p) + cancel_hourglass (); #endif i = read_key_sequence (keybuf, (sizeof keybuf/sizeof (keybuf[0])), @@ -8908,8 +8908,8 @@ then proceeding with a lenghty compuation, but it's not good for code reading keys in a loop, like an input method. */ #ifdef HAVE_X_WINDOWS - if (display_busy_cursor_p) - start_busy_cursor (); + if (display_hourglass_p) + start_hourglass (); #endif #endif @@ -8955,8 +8955,8 @@ } #ifdef HAVE_X_WINDOWS - if (display_busy_cursor_p) - cancel_busy_cursor (); + if (display_hourglass_p) + cancel_hourglass (); #endif i = read_key_sequence (keybuf, (sizeof keybuf/sizeof (keybuf[0])), @@ -8964,8 +8964,8 @@ ! NILP (can_return_switch_frame), 0); #ifdef HAVE_X_WINDOWS - if (display_busy_cursor_p) - start_busy_cursor (); + if (display_hourglass_p) + start_hourglass (); #endif if (i == -1)
--- a/src/minibuf.c Wed Feb 21 13:56:29 2001 +0000 +++ b/src/minibuf.c Wed Feb 21 13:57:40 2001 +0000 @@ -1,6 +1,6 @@ /* Minibuffer input and completion. - Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 - Free Software Foundation, Inc. + Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + 2000, 2001 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -368,8 +368,8 @@ single_kboard_state (); #ifdef HAVE_X_WINDOWS - if (display_busy_cursor_p) - cancel_busy_cursor (); + if (display_hourglass_p) + cancel_hourglass (); #endif val = Qnil;