Use display_hourglass_p, start_hourglass, cancel_hourglass instead of

the old names.

diff --git a/src/eval.c b/src/eval.c
index 08df4e9ccfdc4bfac62ee45b6dc93d915d182b64..7571f802c2e78331d2247182bc090f6180ca1c8c 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -241,8 +241,8 @@ call_debugger (arg)
     max_specpdl_size = specpdl_size + 40;
   
 #ifdef HAVE_X_WINDOWS
-  if (display_busy_cursor_p)
-    cancel_busy_cursor ();
+  if (display_hourglass_p)
+    cancel_hourglass ();
 #endif
 
   debug_on_next_call = 0;
@@ -1366,7 +1366,7 @@ See also the function `condition-case'.")
   Lisp_Object debugger_value;
   Lisp_Object string;
   Lisp_Object real_error_symbol;
-  extern int display_busy_cursor_p;
+  extern int display_hourglass_p;
   struct backtrace *bp;
 
   immediate_quit = handling_signal = 0;
@@ -1381,8 +1381,8 @@ See also the function `condition-case'.")
     real_error_symbol = error_symbol;
 
 #ifdef HAVE_X_WINDOWS
-  if (display_busy_cursor_p)
-    cancel_busy_cursor ();
+  if (display_hourglass_p)
+    cancel_hourglass ();
 #endif
 
   /* This hook is used by edebug.  */

diff --git a/src/fns.c b/src/fns.c
index e31d065c017f07415dfafc7a1cc3b58eb18f9654..29498de417e1ba5815574554219503000b97afc1 100644 (file)
--- a/src/fns.c
+++ b/src/fns.c
@@ -1,5 +1,5 @@
 /* Random utility Lisp functions.
-   Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 98, 99, 2000
+   Copyright (C) 1985, 86, 87, 93, 94, 95, 97, 98, 99, 2000, 2001
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -2811,8 +2811,8 @@ is nil and `use-dialog-box' is non-nil.")
   GCPRO2 (prompt, xprompt);
 
 #ifdef HAVE_X_WINDOWS
-  if (display_busy_cursor_p)
-    cancel_busy_cursor ();
+  if (display_hourglass_p)
+    cancel_hourglass ();
 #endif
 
   while (1)

diff --git a/src/lread.c b/src/lread.c
index 64d3d4dc337cfedf90dcd759690f28c716b33806..b862bbf217b80794fa4f4934b99f06e6b6f21822 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -1,5 +1,5 @@
 /* Lisp parsing and input streams.
-   Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 97, 98, 99, 2000
+   Copyright (C) 1985, 86, 87, 88, 89, 93, 94, 95, 97, 98, 99, 2000, 2001
       Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -427,8 +427,8 @@ read_filtered_event (no_switch_frame, ascii_required, error_nonascii,
   register Lisp_Object val, delayed_switch_frame;
 
 #ifdef HAVE_WINDOW_SYSTEM
-  if (display_busy_cursor_p)
-    cancel_busy_cursor ();
+  if (display_hourglass_p)
+    cancel_hourglass ();
 #endif
   
   delayed_switch_frame = Qnil;
@@ -489,8 +489,8 @@ read_filtered_event (no_switch_frame, ascii_required, error_nonascii,
     unread_switch_frame = delayed_switch_frame;
 
 #ifdef HAVE_WINDOW_SYSTEM
-  if (display_busy_cursor_p)
-    start_busy_cursor ();
+  if (display_hourglass_p)
+    start_hourglass ();
 #endif
   return val;
 }