mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

Use display_hourglass_p, start_hourglass,

Browse source 
cancel_hourglass instead of the old names.
This commit is contained in:
Gerd Moellmann 2001-02-21 13:57:40 +00:00
parent 5fa360661b
commit 526a058f12
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/keyboard.c
View file

@ -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 @@ recursive_edit_1 ()
}
#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 @@ DEFUN ("top-level", Ftop_level, Stop_level, 0, 0, "",
()
{
#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 @@ command_loop_1 ()
/* 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 @@ command_loop_1 ()
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 @@ DEFUN ("read-key-sequence", Fread_key_sequence, Sread_key_sequence, 1, 5, 0,
}
#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 @@ DEFUN ("read-key-sequence", Fread_key_sequence, Sread_key_sequence, 1, 5, 0,
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 @@ DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,
}
#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 @@ DEFUN ("read-key-sequence-vector", Fread_key_sequence_vector,
! 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)

8
src/minibuf.c
View file

@ -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 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
single_kboard_state ();
#ifdef HAVE_X_WINDOWS
if (display_busy_cursor_p)
cancel_busy_cursor ();
if (display_hourglass_p)
cancel_hourglass ();
#endif
val = Qnil;