diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-07-25 14:51:29 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-07-25 14:51:29 -0700 |
| commit | a072c708aaa91e61fa148b1a69884a40a5d8f9fb (patch) | |
| tree | d3fd8cae8b09804c07ba80422b14ce89da458157 | |
| parent | 77109fa849e67b8efab9454002cc10249d0b22da (diff) | |
| download | emacs-a072c708aaa91e61fa148b1a69884a40a5d8f9fb.tar.gz emacs-a072c708aaa91e61fa148b1a69884a40a5d8f9fb.tar.bz2 emacs-a072c708aaa91e61fa148b1a69884a40a5d8f9fb.zip | |
* dispextern.h, xdisp.c (hourglass_shown_p, hourglass_atimer):
Now static.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/dispextern.h | 6 | ||||
| -rw-r--r-- | src/xdisp.c | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8ef82e125f5..bd75180fb55 100644 --- 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 a8cf9c7ee59..400de336965 100644 --- 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 b1de8ba0438..cf027a2b72e 100644 --- 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 */ |