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/nsmenu.m | |
| parent | f488fb6528738131ef41859e1f04125f2e50efce (diff) | |
| parent | 44f230aa043ebb222aa0876b44d70484d5dd38db (diff) | |
| download | emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.tar.gz emacs-40d83b412f584cc02e68d4eac8fd5e6eb769e2fe.zip | |
Merge from trunk
Diffstat (limited to 'src/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index e8d4a256906..623c933ce8e 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -1705,7 +1705,6 @@ void process_dialog (id window, Lisp_Object list) | |||
| 1705 | - (Lisp_Object)runDialogAt: (NSPoint)p | 1705 | - (Lisp_Object)runDialogAt: (NSPoint)p |
| 1706 | { | 1706 | { |
| 1707 | NSInteger ret; | 1707 | NSInteger ret; |
| 1708 | extern EMACS_TIME timer_check (int do_it_now); /* TODO: add to a header */ | ||
| 1709 | 1708 | ||
| 1710 | /* initiate a session that will be ended by pop_down_menu */ | 1709 | /* initiate a session that will be ended by pop_down_menu */ |
| 1711 | popupSession = [NSApp beginModalSessionForWindow: self]; | 1710 | popupSession = [NSApp beginModalSessionForWindow: self]; |
| @@ -1715,7 +1714,7 @@ void process_dialog (id window, Lisp_Object list) | |||
| 1715 | { | 1714 | { |
| 1716 | /* Run this for timers.el, indep of atimers; might not return. | 1715 | /* Run this for timers.el, indep of atimers; might not return. |
| 1717 | TODO: use return value to avoid calling every iteration. */ | 1716 | TODO: use return value to avoid calling every iteration. */ |
| 1718 | timer_check (1); | 1717 | timer_check (); |
| 1719 | [NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow: 0.1]]; | 1718 | [NSThread sleepUntilDate: [NSDate dateWithTimeIntervalSinceNow: 0.1]]; |
| 1720 | } | 1719 | } |
| 1721 | 1720 | ||