*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index 5cea99cf804f2d8a7b19f205169c48b9e2f6a486..9b6101ec968c80f1a0d7a7d6610371aabc4ed323 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -652,10 +652,10 @@ displayed if point is at the end of the line containing the
 whitespace.
 
 +++
-** Busy-cursor.
+** Hourglass pointer
 
-Emacs can optionally display a busy-cursor under X.  You can turn the
-display on or off by customizing group `cursor'.
+Emacs can optionally display an hourglass pointer under X.  You can
+turn the display on or off by customizing group `cursor'.
 
 +++
 ** Blinking cursor

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 700d5fbd0dc1a5acb9ced0b7d4864128e4534f50..258cebedfb3516270361cee7379051b98a8b8750 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index eeff6cba68c82f91249c5b15a111b76f035ea807..2253c41fcb682bf40c879d6a9c948fb22b5c6f1e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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