diff options
| author | Paul Eggert | 2012-05-25 11:19:24 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-05-25 11:19:24 -0700 |
| commit | 42b2a986d9d4b7040fb20c90ec0efeffb78e761a (patch) | |
| tree | d38e7bf5307837f2f38982757f088100de18a64e /src/dispextern.h | |
| parent | e4d81efc58695c19154d5f6733d91172b4c3e5b7 (diff) | |
| parent | a8d3cbf75d219d7a249fc0623219511179e959da (diff) | |
| download | emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.tar.gz emacs-42b2a986d9d4b7040fb20c90ec0efeffb78e761a.zip | |
Merge from trunk.
Diffstat (limited to 'src/dispextern.h')
| -rw-r--r-- | src/dispextern.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index 93611403649..979ade70bfc 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -3243,7 +3243,6 @@ extern Window tip_window; | |||
| 3243 | EXFUN (Fx_hide_tip, 0); | 3243 | EXFUN (Fx_hide_tip, 0); |
| 3244 | extern void start_hourglass (void); | 3244 | extern void start_hourglass (void); |
| 3245 | extern void cancel_hourglass (void); | 3245 | extern void cancel_hourglass (void); |
| 3246 | extern int hourglass_started (void); | ||
| 3247 | extern int hourglass_shown_p; | 3246 | extern int hourglass_shown_p; |
| 3248 | struct atimer; /* Defined in atimer.h. */ | 3247 | struct 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 |