# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 982763937 0
# Node ID e033d60bd0485c3d953973745a9efd0dcbc8a9c5
# Parent  1890bad597621d6210d46f5ae961fb55adb8c1df
Use display_hourglass_p, start_hourglass, cancel_hourglass instead of
the old names.

diff -r 1890bad59762 -r e033d60bd048 src/eval.c
--- a/src/eval.c	Wed Feb 21 13:57:40 2001 +0000
+++ b/src/eval.c	Wed Feb 21 13:58:57 2001 +0000
@@ -241,8 +241,8 @@
     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 @@
   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 @@
     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 -r 1890bad59762 -r e033d60bd048 src/fns.c
--- a/src/fns.c	Wed Feb 21 13:57:40 2001 +0000
+++ b/src/fns.c	Wed Feb 21 13:58:57 2001 +0000
@@ -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 @@
   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 -r 1890bad59762 -r e033d60bd048 src/lread.c
--- a/src/lread.c	Wed Feb 21 13:57:40 2001 +0000
+++ b/src/lread.c	Wed Feb 21 13:58:57 2001 +0000
@@ -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 @@
   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 @@
     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;
 }