diff options
| author | Joakim Verona | 2012-09-19 01:09:51 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-09-19 01:09:51 +0200 |
| commit | 6c86337db3f2b22977d7b94b054458a2d446c504 (patch) | |
| tree | 04725c50cbd76c8ffd0faf4cdce895a89a506a58 /src/nsmenu.m | |
| parent | aac9139d11cf7f9ee84d931ada85be8fa0c90f21 (diff) | |
| parent | fefa299077c02a931e5e72f7646e3dfa28f5e8ff (diff) | |
| download | emacs-6c86337db3f2b22977d7b94b054458a2d446c504.tar.gz emacs-6c86337db3f2b22977d7b94b054458a2d446c504.zip | |
not compiling yet
Diffstat (limited to 'src/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index d0f3e45e939..907d3eac622 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -24,7 +24,6 @@ Carbon version by Yamamoto Mitsuharu. */ | |||
| 24 | /* This should be the first include, as it may set up #defines affecting | 24 | /* This should be the first include, as it may set up #defines affecting |
| 25 | interpretation of even the system includes. */ | 25 | interpretation of even the system includes. */ |
| 26 | #include <config.h> | 26 | #include <config.h> |
| 27 | #include <setjmp.h> | ||
| 28 | 27 | ||
| 29 | #include "lisp.h" | 28 | #include "lisp.h" |
| 30 | #include "window.h" | 29 | #include "window.h" |
| @@ -589,10 +588,7 @@ extern NSString *NSMenuDidBeginTrackingNotification; | |||
| 589 | From 10.6 on, we could also use -[NSMenu propertiesToUpdate]: In the | 588 | From 10.6 on, we could also use -[NSMenu propertiesToUpdate]: In the |
| 590 | key press case, NSMenuPropertyItemImage (e.g.) won't be set. | 589 | key press case, NSMenuPropertyItemImage (e.g.) won't be set. |
| 591 | */ | 590 | */ |
| 592 | if (trackingMenu == 0 | 591 | if (trackingMenu == 0) |
| 593 | /* Also, don't try this if from an event picked up asynchronously, | ||
| 594 | as lots of lisp evaluation happens in ns_update_menubar. */ | ||
| 595 | || handling_signal != 0) | ||
| 596 | return; | 592 | return; |
| 597 | /*fprintf (stderr, "Updating menu '%s'\n", [[self title] UTF8String]); NSLog (@"%@\n", event); */ | 593 | /*fprintf (stderr, "Updating menu '%s'\n", [[self title] UTF8String]); NSLog (@"%@\n", event); */ |
| 598 | ns_update_menubar (frame, 1, self); | 594 | ns_update_menubar (frame, 1, self); |