# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 982764641 0
# Node ID 80ad019be2727f132eecac07e3401b2a6a7fbb61
# Parent  b34422d45e68163cbd12cae4d697b4963ef08826
*** empty log message ***

diff -r b34422d45e68 -r 80ad019be272 etc/NEWS
--- a/etc/NEWS	Wed Feb 21 14:08:38 2001 +0000
+++ b/etc/NEWS	Wed Feb 21 14:10:41 2001 +0000
@@ -652,10 +652,10 @@
 whitespace.
 
 +++
-** Busy-cursor.
-
-Emacs can optionally display a busy-cursor under X.  You can turn the
-display on or off by customizing group `cursor'.
+** Hourglass pointer
+
+Emacs can optionally display an hourglass pointer under X.  You can
+turn the display on or off by customizing group `cursor'.
 
 +++
 ** Blinking cursor
diff -r b34422d45e68 -r 80ad019be272 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Feb 21 14:08:38 2001 +0000
+++ b/lisp/ChangeLog	Wed Feb 21 14:10:41 2001 +0000
@@ -1,3 +1,12 @@
+2001-02-21  Gerd Moellmann  <gerd@gnu.org>
+
+	* startup.el (fancy-splash-screens): Use display-hourglass
+	instead of display-busy-cursor.
+
+	* frame.el (display-hourglass): Renamed from busy-cursor.
+	(hourglass-delay): Renamed from busy-cursor-delay-seconds.
+	(show-cursor-in-non-selected-windows): Doc fix.
+
 2001-02-20  Dave Love  <fx@gnu.org>
 
 	* international/utf-8.el: Doc and commentary fixes.
diff -r b34422d45e68 -r 80ad019be272 src/ChangeLog
--- a/src/ChangeLog	Wed Feb 21 14:08:38 2001 +0000
+++ b/src/ChangeLog	Wed Feb 21 14:10:41 2001 +0000
@@ -1,3 +1,38 @@
+2001-02-21  Gerd Moellmann  <gerd@gnu.org>
+
+	* keyboard.c, minibuf.c, lread.c, fns.c, eval.c: Use
+	display_hourglass_p, start_hourglass, cancel_hourglass instead of
+	the old names.
+
+	* w32term.h (struct x_output): Rename busy_cursor to
+	hourglass_cursor, busy_window to hourglass_window, busy_p to
+	hourglass_p.
+
+	* msdos.h (struct x_output): Rename busy_window to
+	hourglass_window, busy_p to hourglass_p.
+
+	* xterm.h (struct x_output): Rename busy_cursor to
+	hourglass_cursor, busy_window to hourglass_window, busy_p to
+	hourglass_p.
+
+	* xfns.c: Rename everything containing *busy_cursor* and similar
+	to *hourglass*.
+	(syms_of_w32fns): Rename x-busy-pointer-shape to
+	x-hourglass-pointer-shape, display-busy-cursor to
+	display-hourglass, busy-cursor-delay to hourglass-delay.
+
+	* w32fns.c: Rename everything containing *busy_cursor* and similar
+	to *hourglass*.
+	(syms_of_w32fns): Rename x-busy-pointer-shape to
+	x-hourglass-pointer-shape, display-busy-cursor to
+	display-hourglass, busy-cursor-delay to hourglass-delay.
+
+	* xterm.c (XTread_socket): Test x_output's hourglass_p instead
+	of its busy_p flag.
+
+	* dispextern.h (start_hourglass, cancel_hourglass)
+	(display_hourglass_p): Renamed from *busy_cursor*.
+
 2001-02-20  Gerd Moellmann  <gerd@gnu.org>
 
 	* keyboard.c (read_char): When an event from unread-command-events