diff options
| author | Kenichi Handa | 2012-10-07 21:58:14 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-10-07 21:58:14 +0900 |
| commit | dade5fca51ce2ed10fdace1cfcf78287599154a1 (patch) | |
| tree | 299c84e1ce2c5a95237b41781113790626d259c5 /src/nsmenu.m | |
| parent | 6aa75fb62f6cdc4164d935ef14d57feec5ed6e0a (diff) | |
| parent | 78d876b90e52400b7bbb086ca1a471d3d20d0e98 (diff) | |
| download | emacs-dade5fca51ce2ed10fdace1cfcf78287599154a1.tar.gz emacs-dade5fca51ce2ed10fdace1cfcf78287599154a1.zip | |
merge trunk
Diffstat (limited to 'src/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index b60cc005c5f..9af732c6c45 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -722,11 +722,6 @@ extern NSString *NSMenuDidBeginTrackingNotification; | |||
| 722 | #ifdef NS_IMPL_GNUSTEP | 722 | #ifdef NS_IMPL_GNUSTEP |
| 723 | if ([[self window] isVisible]) | 723 | if ([[self window] isVisible]) |
| 724 | [self sizeToFit]; | 724 | [self sizeToFit]; |
| 725 | #else | ||
| 726 | #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_2 | ||
| 727 | if ([self supermenu] == nil) | ||
| 728 | [self sizeToFit]; | ||
| 729 | #endif | ||
| 730 | #endif | 725 | #endif |
| 731 | } | 726 | } |
| 732 | 727 | ||