aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2012-05-10 23:39:26 -0700
committerPaul Eggert2012-05-10 23:39:26 -0700
commit53f7d2c04e3e5f2c340942b545e423a0717d34cb (patch)
tree5a7ea54554992daa877d743120ade9d1272507d5 /src
parent75aafb17a6569408f2fcf9076ebf62f38bef1b09 (diff)
downloademacs-53f7d2c04e3e5f2c340942b545e423a0717d34cb.tar.gz
emacs-53f7d2c04e3e5f2c340942b545e423a0717d34cb.zip
Remove unused function hourglass_started.
* dispextern.h (hourglass_started): * w32fns.c (hourglass_started): * xdisp.c (hourglass_started): Remove.
Diffstat (limited to 'src')
-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 @@
12012-05-11 Paul Eggert <eggert@cs.ucla.edu>
2
3 Remove unused function hourglass_started.
4 * dispextern.h (hourglass_started):
5 * w32fns.c (hourglass_started):
6 * xdisp.c (hourglass_started): Remove.
7
12012-05-10 Juanma Barranquero <lekktu@gmail.com> 82012-05-10 Juanma Barranquero <lekktu@gmail.com>
2 9
3 * makefile.w32-in ($(BLD)/gmalloc.$(O), $(BLD)/w32menu.$(O)): 10 * 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;
3243EXFUN (Fx_hide_tip, 0); 3243EXFUN (Fx_hide_tip, 0);
3244extern void start_hourglass (void); 3244extern void start_hourglass (void);
3245extern void cancel_hourglass (void); 3245extern void cancel_hourglass (void);
3246extern int hourglass_started (void);
3247extern int hourglass_shown_p; 3246extern int hourglass_shown_p;
3248struct atimer; /* Defined in atimer.h. */ 3247struct atimer; /* Defined in atimer.h. */
3249/* If non-null, an asynchronous timer that, when it expires, displays 3248/* 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). */)
5016 cursor. Duplicated from xdisp.c, but cannot use the version there 5016 cursor. Duplicated from xdisp.c, but cannot use the version there
5017 due to lack of atimers on w32. */ 5017 due to lack of atimers on w32. */
5018#define DEFAULT_HOURGLASS_DELAY 1 5018#define DEFAULT_HOURGLASS_DELAY 1
5019/* Return non-zero if hourglass timer has been started or hourglass is
5020 shown. */
5021/* PENDING: if W32 can use atimers (atimer.[hc]) then the common impl in
5022 xdisp.c could be used. */
5023
5024int
5025hourglass_started (void)
5026{
5027 return hourglass_shown_p || hourglass_timer;
5028}
5029 5019
5030/* Cancel a currently active hourglass timer, and start a new one. */ 5020/* Cancel a currently active hourglass timer, and start a new one. */
5031 5021
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)
28882 28882
28883/* Platform-independent portion of hourglass implementation. */ 28883/* Platform-independent portion of hourglass implementation. */
28884 28884
28885/* Return non-zero if hourglass timer has been started or hourglass is
28886 shown. */
28887int
28888hourglass_started (void)
28889{
28890 return hourglass_shown_p || hourglass_atimer != NULL;
28891}
28892
28893/* Cancel a currently active hourglass timer, and start a new one. */ 28885/* Cancel a currently active hourglass timer, and start a new one. */
28894void 28886void
28895start_hourglass (void) 28887start_hourglass (void)