* dispextern.h, xdisp.c (hourglass_shown_p, hourglass_atimer):

Now static.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8ef82e125f5204bdc55f72eeead80d72cf3cc4f7..bd75180fb55a367c6152380693aa6ecbac3a92a2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * dispextern.h, xdisp.c (hourglass_shown_p, hourglass_atimer):
+       Now static.
+
 2014-07-26  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * atimer.c (set_alarm) [HAVE_ITIMERSPEC]: Use TIMER_ABSTIME

diff --git a/src/dispextern.h b/src/dispextern.h
index a8cf9c7ee59119637cae272aaf104e7cec545528..400de3369651c33e4cced867fd9687e7bd35157c 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1719,7 +1719,7 @@ struct face
 #ifdef HAVE_XFT
   /* Extra member that a font-driver uses privately.  */
   void *extra;
-#endif  
+#endif
 };
 
 
@@ -3397,10 +3397,6 @@ extern frame_parm_handler x_frame_parm_handlers[];
 
 extern void start_hourglass (void);
 extern void cancel_hourglass (void);
-extern bool hourglass_shown_p;
-/* If non-null, an asynchronous timer that, when it expires, displays
-   an hourglass cursor on all frames.  */
-extern struct atimer *hourglass_atimer;
 
 /* Returns the background color of IMG, calculating one heuristically if
    necessary.  If non-zero, XIMG is an existing XImage object to use for

diff --git a/src/xdisp.c b/src/xdisp.c
index b1de8ba043880d763c5f9bb737811b92aa7cff3f..cf027a2b72e679b324592088a7b34fac6d31f985 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -816,11 +816,11 @@ Lisp_Object previous_help_echo_string;
 #ifdef HAVE_WINDOW_SYSTEM
 
 /* Non-zero means an hourglass cursor is currently shown.  */
-bool hourglass_shown_p;
+static bool hourglass_shown_p;
 
 /* If non-null, an asynchronous timer that, when it expires, displays
    an hourglass cursor on all frames.  */
-struct atimer *hourglass_atimer;
+static struct atimer *hourglass_atimer;
 
 #endif /* HAVE_WINDOW_SYSTEM */