diff options
| author | Jan Djärv | 2011-03-27 11:23:52 +0200 |
|---|---|---|
| committer | Jan Djärv | 2011-03-27 11:23:52 +0200 |
| commit | 5c380ffb17f2fb6f22d9f24a7732b7e4a1e0cd52 (patch) | |
| tree | ec04af9d29825f5d633c3cae161a2da993c9b9df /src | |
| parent | a4800c245067b1344d83e7cc6b2c538cbc0d2606 (diff) | |
| download | emacs-5c380ffb17f2fb6f22d9f24a7732b7e4a1e0cd52.tar.gz emacs-5c380ffb17f2fb6f22d9f24a7732b7e4a1e0cd52.zip | |
* nsmenu.m (runDialogAt): Remove argument to timer_check.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/nsmenu.m | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 54b24c50a1c..eb03806b33a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-03-27 Jan Djärv <jan.h.d@swipnet.se> | ||
| 2 | |||
| 3 | * nsmenu.m (runDialogAt): Remove argument to timer_check. | ||
| 4 | |||
| 1 | 2011-03-27 Glenn Morris <rgm@gnu.org> | 5 | 2011-03-27 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * syssignal.h: Replace RETSIGTYPE with void. | 7 | * syssignal.h: Replace RETSIGTYPE with void. |
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 | ||