diff options
| author | Stefan Monnier | 2011-03-31 00:24:03 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2011-03-31 00:24:03 -0400 |
| commit | 40d83b412f584cc02e68d4eac8fd5e6eb769e2fe (patch) | |
| tree | b56f27a7e6d75a8c1fd27b00179a27b5efea0a32 /src/gtkutil.c | |
| parent | f488fb6528738131ef41859e1f04125f2e50efce (diff) | |
| parent | 44f230aa043ebb222aa0876b44d70484d5dd38db (diff) | |
| download | emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.tar.gz emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.zip | |
Merge from trunk
Diffstat (limited to 'src/gtkutil.c')
| -rw-r--r-- | src/gtkutil.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gtkutil.c b/src/gtkutil.c index 754f61e366d..4e5ecce76c7 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -1555,7 +1555,7 @@ static gboolean | |||
| 1555 | xg_maybe_add_timer (gpointer data) | 1555 | xg_maybe_add_timer (gpointer data) |
| 1556 | { | 1556 | { |
| 1557 | struct xg_dialog_data *dd = (struct xg_dialog_data *) data; | 1557 | struct xg_dialog_data *dd = (struct xg_dialog_data *) data; |
| 1558 | EMACS_TIME next_time = timer_check (1); | 1558 | EMACS_TIME next_time = timer_check (); |
| 1559 | long secs = EMACS_SECS (next_time); | 1559 | long secs = EMACS_SECS (next_time); |
| 1560 | long usecs = EMACS_USECS (next_time); | 1560 | long usecs = EMACS_USECS (next_time); |
| 1561 | 1561 | ||