diff options
| author | Miles Bader | 2007-12-28 22:26:14 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-12-28 22:26:14 +0000 |
| commit | b17f53abc28496125965f36147b76ea5f6a2b4fb (patch) | |
| tree | 4293e53692f304327ba689dfeea32d1b0b5bc12a /src/macmenu.c | |
| parent | 2e5093251c8e63f4546ffc30182dd4015e9a58fd (diff) | |
| parent | ea7ac2eb953bf3c30670e60cb00a9fca611b38b7 (diff) | |
| download | emacs-b17f53abc28496125965f36147b76ea5f6a2b4fb.tar.gz emacs-b17f53abc28496125965f36147b76ea5f6a2b4fb.zip | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-966
Diffstat (limited to 'src/macmenu.c')
| -rw-r--r-- | src/macmenu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/macmenu.c b/src/macmenu.c index aa0be0bdc2e..616d136465a 100644 --- a/src/macmenu.c +++ b/src/macmenu.c | |||
| @@ -3272,7 +3272,8 @@ fill_menubar (wv, deep_p) | |||
| 3272 | } | 3272 | } |
| 3273 | #endif /* !TARGET_API_MAC_CARBON */ | 3273 | #endif /* !TARGET_API_MAC_CARBON */ |
| 3274 | } | 3274 | } |
| 3275 | else | 3275 | |
| 3276 | if (!menu) | ||
| 3276 | { | 3277 | { |
| 3277 | #if TARGET_API_MAC_CARBON | 3278 | #if TARGET_API_MAC_CARBON |
| 3278 | err = CreateNewMenu (id, 0, &menu); | 3279 | err = CreateNewMenu (id, 0, &menu); |