diff options
| author | Paul Eggert | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/atimer.h | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
| download | emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip | |
Merge from mainline.
Diffstat (limited to 'src/atimer.h')
| -rw-r--r-- | src/atimer.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/atimer.h b/src/atimer.h index 798181fcd7f..8035681b225 100644 --- a/src/atimer.h +++ b/src/atimer.h | |||
| @@ -76,8 +76,6 @@ void do_pending_atimers (void); | |||
| 76 | void init_atimer (void); | 76 | void init_atimer (void); |
| 77 | void turn_on_atimers (int); | 77 | void turn_on_atimers (int); |
| 78 | void stop_other_atimers (struct atimer *); | 78 | void stop_other_atimers (struct atimer *); |
| 79 | void run_all_atimers (void); | ||
| 80 | Lisp_Object unwind_stop_other_atimers (Lisp_Object); | 79 | Lisp_Object unwind_stop_other_atimers (Lisp_Object); |
| 81 | 80 | ||
| 82 | #endif /* EMACS_ATIMER_H */ | 81 | #endif /* EMACS_ATIMER_H */ |
| 83 | |||