diff options
| author | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-12-10 19:13:08 -0500 |
| commit | 2c302df3a13236bfbf8ea1b771d13618fcda8d71 (patch) | |
| tree | f26dc9f22861dc37610de319d05255de058c221b /src/atimer.c | |
| parent | 0c747cb143fa227e78f350ac353d703f489209df (diff) | |
| parent | 175069efeb080517afefdd44a06f7a779ea8c25c (diff) | |
| download | emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.tar.gz emacs-2c302df3a13236bfbf8ea1b771d13618fcda8d71.zip | |
Merge from trunk
Diffstat (limited to 'src/atimer.c')
| -rw-r--r-- | src/atimer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/atimer.c b/src/atimer.c index 9fd9dee835e..6258908e0b2 100644 --- a/src/atimer.c +++ b/src/atimer.c | |||
| @@ -171,9 +171,9 @@ cancel_atimer (struct atimer *timer) | |||
| 171 | for (t = *list, prev = NULL; t && t != timer; prev = t, t = t->next) | 171 | for (t = *list, prev = NULL; t && t != timer; prev = t, t = t->next) |
| 172 | ; | 172 | ; |
| 173 | 173 | ||
| 174 | /* If it is, take it off the its list, and put in on the | 174 | /* If it is, take it off its list, and put in on the free-list. |
| 175 | free-list. We don't bother to arrange for setting a | 175 | We don't bother to arrange for setting a different alarm time, |
| 176 | different alarm time, since a too early one doesn't hurt. */ | 176 | since a too early one doesn't hurt. */ |
| 177 | if (t) | 177 | if (t) |
| 178 | { | 178 | { |
| 179 | if (prev) | 179 | if (prev) |