summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog7
-rw-r--r--src/dispextern.h1
-rw-r--r--src/w32fns.c10
-rw-r--r--src/xdisp.c8
4 files changed, 7 insertions, 19 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d86d55816f4..805fa7ee097 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-11 Paul Eggert <eggert@cs.ucla.edu>
+
+ Remove unused function hourglass_started.
+ * dispextern.h (hourglass_started):
+ * w32fns.c (hourglass_started):
+ * xdisp.c (hourglass_started): Remove.
+
2012-05-10 Juanma Barranquero <lekktu@gmail.com>
* makefile.w32-in ($(BLD)/gmalloc.$(O), $(BLD)/w32menu.$(O)):
diff --git a/src/dispextern.h b/src/dispextern.h
index 4804a9e61c6..c7652504de2 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3243,7 +3243,6 @@ extern Window tip_window;
EXFUN (Fx_hide_tip, 0);
extern void start_hourglass (void);
extern void cancel_hourglass (void);
-extern int hourglass_started (void);
extern int hourglass_shown_p;
struct atimer; /* Defined in atimer.h. */
/* If non-null, an asynchronous timer that, when it expires, displays
diff --git a/src/w32fns.c b/src/w32fns.c
index 510d1e94f16..a3ccb4ea3e5 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5016,16 +5016,6 @@ no value of TYPE (always string in the MS Windows case). */)
cursor. Duplicated from xdisp.c, but cannot use the version there
due to lack of atimers on w32. */
#define DEFAULT_HOURGLASS_DELAY 1
-/* Return non-zero if hourglass timer has been started or hourglass is
- shown. */
-/* PENDING: if W32 can use atimers (atimer.[hc]) then the common impl in
- xdisp.c could be used. */
-
-int
-hourglass_started (void)
-{
- return hourglass_shown_p || hourglass_timer;
-}
/* Cancel a currently active hourglass timer, and start a new one. */
diff --git a/src/xdisp.c b/src/xdisp.c
index eaad5455212..36ca69956d4 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -28882,14 +28882,6 @@ init_xdisp (void)
/* Platform-independent portion of hourglass implementation. */
-/* Return non-zero if hourglass timer has been started or hourglass is
- shown. */
-int
-hourglass_started (void)
-{
- return hourglass_shown_p || hourglass_atimer != NULL;
-}
-
/* Cancel a currently active hourglass timer, and start a new one. */
void
start_hourglass (void)